From d306fc8b509dcbff5fb1aecc9617d68e3ecf93f0 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Thu, 14 Nov 2024 15:06:55 +0100 Subject: [PATCH] deps: update grpc to 1.67.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodesource/nsolid/pull/220 Reviewed-By: Trevor Norris PR-URL: https://github.com/nodesource/nsolid/pull/224 Reviewed-By: Juan José Arboleda --- deps/grpc/.bazelversion | 2 +- deps/grpc/.clang-tidy | 21 +- deps/grpc/.gitignore | 3 - deps/grpc/Makefile | 43 +- deps/grpc/grpc.gyp | 29 +- deps/grpc/include/grpc/credentials.h | 2 +- deps/grpc/include/grpc/event_engine/README.md | 2 +- .../include/grpc/event_engine/event_engine.h | 14 + .../include/grpc/event_engine/extensible.h | 3 + .../grpc/event_engine/internal/slice_cast.h | 2 +- .../grpc/event_engine/memory_request.h | 18 + deps/grpc/include/grpc/event_engine/slice.h | 1 - .../include/grpc/event_engine/slice_buffer.h | 1 - deps/grpc/include/grpc/grpc_crl_provider.h | 2 +- .../include/grpc/impl/channel_arg_names.h | 2 +- deps/grpc/include/grpc/support/log.h | 84 +- deps/grpc/include/grpc/support/metrics.h | 17 +- .../grpc/include/grpc/support/port_platform.h | 22 + deps/grpc/include/grpc/support/sync_generic.h | 6 +- deps/grpc/include/grpcpp/client_context.h | 1 - deps/grpc/include/grpcpp/completion_queue.h | 1 - .../include/grpcpp/ext/call_metric_recorder.h | 2 +- .../grpcpp/generic/async_generic_service.h | 54 +- .../grpcpp/generic/callback_generic_service.h | 84 + .../include/grpcpp/generic/generic_stub.h | 83 +- .../grpcpp/generic/generic_stub_callback.h | 44 + .../grpcpp/impl/codegen/config_protobuf.h | 2 + .../grpcpp/impl/generic_stub_internal.h | 125 + .../include/grpcpp/impl/interceptor_common.h | 1 - deps/grpc/include/grpcpp/impl/metadata_map.h | 1 - deps/grpc/include/grpcpp/impl/proto_utils.h | 5 +- .../grpcpp/impl/server_callback_handlers.h | 1 - deps/grpc/include/grpcpp/impl/service_type.h | 1 - deps/grpc/include/grpcpp/impl/sync.h | 1 - .../include/grpcpp/security/credentials.h | 4 +- .../grpcpp/security/server_credentials.h | 3 - .../security/tls_certificate_provider.h | 1 - .../security/tls_certificate_verifier.h | 1 - .../grpcpp/security/tls_credentials_options.h | 1 - deps/grpc/include/grpcpp/server_builder.h | 2 +- deps/grpc/include/grpcpp/server_interface.h | 1 - .../include/grpcpp/support/async_stream.h | 1 - .../include/grpcpp/support/async_unary_call.h | 1 - .../grpc/include/grpcpp/support/byte_buffer.h | 3 +- .../include/grpcpp/support/callback_common.h | 27 +- .../include/grpcpp/support/client_callback.h | 1 - .../grpcpp/support/client_interceptor.h | 1 - deps/grpc/include/grpcpp/support/config.h | 2 +- .../grpcpp/support/global_callback_hook.h | 58 + .../grpc/include/grpcpp/support/interceptor.h | 2 +- .../include/grpcpp/support/method_handler.h | 1 - .../grpcpp/support/proto_buffer_reader.h | 1 - .../grpcpp/support/proto_buffer_writer.h | 1 - .../grpcpp/support/server_interceptor.h | 1 - .../grpc/include/grpcpp/support/sync_stream.h | 1 - deps/grpc/include/grpcpp/version_info.h | 6 +- deps/grpc/src/compiler/.clang-format | 50 - deps/grpc/src/compiler/BUILD | 129 - deps/grpc/src/compiler/README.md | 4 - deps/grpc/src/compiler/config.h | 68 - deps/grpc/src/compiler/config_protobuf.h | 64 - deps/grpc/src/compiler/cpp_generator.cc | 2501 ------ deps/grpc/src/compiler/cpp_generator.h | 139 - .../grpc/src/compiler/cpp_generator_helpers.h | 63 - deps/grpc/src/compiler/cpp_plugin.cc | 26 - deps/grpc/src/compiler/cpp_plugin.h | 189 - deps/grpc/src/compiler/csharp_generator.cc | 852 --- deps/grpc/src/compiler/csharp_generator.h | 32 - .../src/compiler/csharp_generator_helpers.h | 61 - deps/grpc/src/compiler/csharp_plugin.cc | 110 - deps/grpc/src/compiler/generator_helpers.h | 277 - deps/grpc/src/compiler/node_generator.cc | 276 - deps/grpc/src/compiler/node_generator.h | 37 - .../src/compiler/node_generator_helpers.h | 42 - deps/grpc/src/compiler/node_plugin.cc | 82 - .../src/compiler/objective_c_generator.cc | 459 -- .../grpc/src/compiler/objective_c_generator.h | 59 - .../compiler/objective_c_generator_helpers.h | 125 - deps/grpc/src/compiler/objective_c_plugin.cc | 340 - deps/grpc/src/compiler/php_generator.cc | 352 - deps/grpc/src/compiler/php_generator.h | 33 - .../grpc/src/compiler/php_generator_helpers.h | 80 - deps/grpc/src/compiler/php_plugin.cc | 109 - deps/grpc/src/compiler/proto_parser_helper.cc | 29 - deps/grpc/src/compiler/proto_parser_helper.h | 22 - deps/grpc/src/compiler/protobuf_plugin.h | 206 - deps/grpc/src/compiler/python_generator.cc | 989 --- deps/grpc/src/compiler/python_generator.h | 77 - .../src/compiler/python_generator_helpers.h | 162 - deps/grpc/src/compiler/python_plugin.cc | 29 - .../src/compiler/python_private_generator.h | 87 - deps/grpc/src/compiler/ruby_generator.cc | 244 - deps/grpc/src/compiler/ruby_generator.h | 30 - .../src/compiler/ruby_generator_helpers-inl.h | 58 - .../src/compiler/ruby_generator_map-inl.h | 57 - .../src/compiler/ruby_generator_string-inl.h | 151 - deps/grpc/src/compiler/ruby_plugin.cc | 74 - deps/grpc/src/compiler/schema_interface.h | 119 - deps/grpc/src/core/BUILD | 875 ++- deps/grpc/src/core/channelz/channelz.cc | 1 - .../src/core/channelz/channelz_registry.cc | 1 - .../src/core/client_channel/client_channel.cc | 172 +- .../src/core/client_channel/client_channel.h | 2 +- .../client_channel/client_channel_filter.cc | 189 +- .../client_channel/client_channel_filter.h | 2 +- .../client_channel/client_channel_internal.h | 8 +- .../core/client_channel/config_selector.cc | 60 - .../src/core/client_channel/config_selector.h | 32 +- .../src/core/client_channel/direct_channel.cc | 83 + .../src/core/client_channel/direct_channel.h | 101 + .../core/client_channel/dynamic_filters.cc | 6 +- .../src/core/client_channel/lb_metadata.cc | 120 + .../src/core/client_channel/lb_metadata.h | 56 + .../load_balanced_call_destination.cc | 78 +- .../client_channel/local_subchannel_pool.cc | 2 - .../src/core/client_channel/retry_filter.cc | 2 +- .../src/core/client_channel/retry_filter.h | 1 - .../retry_filter_legacy_call_data.cc | 465 +- .../src/core/client_channel/subchannel.cc | 130 +- .../grpc/src/core/client_channel/subchannel.h | 14 +- .../subchannel_stream_client.cc | 2 +- .../backend_metrics/backend_metric_filter.cc | 22 +- .../backend_metrics/backend_metric_filter.h | 2 + .../core/ext/filters/census/grpc_context.cc | 8 +- .../legacy_channel_idle_filter.cc | 28 +- .../channel_idle/legacy_channel_idle_filter.h | 4 + .../fault_injection/fault_injection_filter.cc | 12 +- .../fault_injection/fault_injection_filter.h | 2 + .../gcp_authentication_filter.cc | 167 + .../gcp_authentication_filter.h | 82 + ...cp_authentication_service_config_parser.cc | 81 + ...gcp_authentication_service_config_parser.h | 87 + .../filters/http/client/http_client_filter.cc | 2 +- .../filters/http/client/http_client_filter.h | 2 + .../filters/http/client_authority_filter.cc | 3 +- .../filters/http/client_authority_filter.h | 2 + .../message_compress/compression_filter.cc | 41 +- .../message_compress/compression_filter.h | 5 + .../filters/http/server/http_server_filter.cc | 10 +- .../filters/http/server/http_server_filter.h | 2 + .../server_load_reporting_filter.cc | 21 +- .../server_load_reporting_filter.h | 2 + .../ext/filters/logging/logging_filter.cc | 13 +- .../core/ext/filters/logging/logging_filter.h | 4 + .../message_size/message_size_filter.cc | 33 +- .../message_size/message_size_filter.h | 4 + .../src/core/ext/filters/rbac/rbac_filter.cc | 2 +- .../src/core/ext/filters/rbac/rbac_filter.h | 2 + .../stateful_session_filter.cc | 5 +- .../stateful_session_filter.h | 2 + .../binder/client/binder_connector.cc | 6 +- .../transport/binder/client/channel_create.cc | 49 +- .../binder/client/channel_create_impl.cc | 1 - .../ext/transport/binder/client/jni_utils.cc | 18 +- .../security_policy/binder_security_policy.cc | 11 +- .../transport/binder/server/binder_server.cc | 9 +- .../binder/transport/binder_transport.cc | 49 +- .../binder/transport/binder_transport.h | 2 +- .../ext/transport/binder/utils/ndk_binder.cc | 14 +- .../binder/wire_format/binder_android.cc | 14 +- .../binder/wire_format/transaction.h | 2 +- .../binder/wire_format/wire_reader_impl.cc | 60 +- .../binder/wire_format/wire_writer.cc | 43 +- .../chaotic_good/chaotic_good_transport.h | 36 +- .../client/chaotic_good_connector.cc | 116 +- .../client/chaotic_good_connector.h | 6 +- .../chaotic_good/client_transport.cc | 99 +- .../transport/chaotic_good/client_transport.h | 7 +- .../core/ext/transport/chaotic_good/frame.cc | 3 +- .../core/ext/transport/chaotic_good/frame.h | 3 + .../transport/chaotic_good/frame_header.cc | 1 - .../server/chaotic_good_server.cc | 66 +- .../chaotic_good/server/chaotic_good_server.h | 4 +- .../chaotic_good/server_transport.cc | 148 +- .../transport/chaotic_good/server_transport.h | 6 +- .../chaotic_good/settings_metadata.cc | 2 +- .../core/ext/transport/chttp2/alpn/alpn.cc | 1 - .../chttp2/client/chttp2_connector.cc | 119 +- .../chttp2/client/chttp2_connector.h | 2 +- .../transport/chttp2/server/chttp2_server.cc | 214 +- .../transport/chttp2/transport/bin_decoder.cc | 46 +- .../transport/chttp2/transport/bin_encoder.cc | 1 - .../chttp2/transport/chttp2_transport.cc | 796 +- .../chttp2/transport/chttp2_transport.h | 4 +- .../chttp2/transport/flow_control.cc | 9 +- .../transport/chttp2/transport/flow_control.h | 1 - .../ext/transport/chttp2/transport/frame.cc | 1 - .../transport/chttp2/transport/frame_data.cc | 11 +- .../transport/chttp2/transport/frame_data.h | 3 +- .../chttp2/transport/frame_goaway.cc | 1 - .../transport/chttp2/transport/frame_ping.cc | 21 +- .../chttp2/transport/frame_rst_stream.cc | 25 +- .../chttp2/transport/frame_rst_stream.h | 8 +- .../chttp2/transport/frame_settings.cc | 22 +- .../chttp2/transport/frame_window_update.cc | 11 +- .../chttp2/transport/frame_window_update.h | 4 +- .../chttp2/transport/hpack_encoder.cc | 12 +- .../chttp2/transport/hpack_encoder.h | 9 +- .../chttp2/transport/hpack_encoder_table.cc | 1 - .../chttp2/transport/hpack_parse_result.h | 1 - .../chttp2/transport/hpack_parser.cc | 87 +- .../transport/chttp2/transport/hpack_parser.h | 2 + .../chttp2/transport/hpack_parser_table.cc | 42 +- .../chttp2/transport/hpack_parser_table.h | 33 +- .../ext/transport/chttp2/transport/internal.h | 68 +- .../max_concurrent_streams_policy.cc | 45 - .../transport/max_concurrent_streams_policy.h | 67 - .../ext/transport/chttp2/transport/parsing.cc | 149 +- .../chttp2/transport/ping_callbacks.cc | 1 - .../chttp2/transport/stream_lists.cc | 20 +- .../ext/transport/chttp2/transport/varint.h | 1 - .../chttp2/transport/write_size_policy.cc | 1 - .../ext/transport/chttp2/transport/writing.cc | 196 +- .../client/secure/cronet_channel_create.cc | 7 +- .../cronet/transport/cronet_api_phony.cc | 1 - .../cronet/transport/cronet_transport.cc | 850 ++- .../ext/transport/inproc/inproc_transport.cc | 129 +- .../inproc/legacy_inproc_transport.cc | 199 +- .../ext/upb-gen/envoy/admin/v3/certs.upb.h | 22 +- .../envoy/admin/v3/certs.upb_minitable.c | 15 + .../ext/upb-gen/envoy/admin/v3/clusters.upb.h | 46 +- .../envoy/admin/v3/clusters.upb_minitable.c | 12 + .../upb-gen/envoy/admin/v3/config_dump.upb.h | 22 +- .../admin/v3/config_dump.upb_minitable.c | 15 + .../envoy/admin/v3/config_dump_shared.upb.h | 100 +- .../v3/config_dump_shared.upb_minitable.c | 57 + .../upb-gen/envoy/admin/v3/init_dump.upb.h | 2 +- .../envoy/admin/v3/init_dump.upb_minitable.c | 6 + .../upb-gen/envoy/admin/v3/listeners.upb.h | 4 +- .../envoy/admin/v3/listeners.upb_minitable.c | 6 + .../ext/upb-gen/envoy/admin/v3/memory.upb.h | 12 +- .../envoy/admin/v3/memory.upb_minitable.c | 3 + .../ext/upb-gen/envoy/admin/v3/metrics.upb.h | 6 +- .../envoy/admin/v3/metrics.upb_minitable.c | 3 + .../upb-gen/envoy/admin/v3/mutex_stats.upb.h | 6 +- .../admin/v3/mutex_stats.upb_minitable.c | 3 + .../upb-gen/envoy/admin/v3/server_info.upb.h | 188 +- .../admin/v3/server_info.upb_minitable.c | 38 +- .../core/ext/upb-gen/envoy/admin/v3/tap.upb.h | 4 +- .../envoy/admin/v3/tap.upb_minitable.c | 3 + .../envoy/annotations/deprecation.upb.h | 8 +- .../upb-gen/envoy/annotations/resource.upb.h | 13 +- .../annotations/resource.upb_minitable.c | 3 + .../envoy/config/accesslog/v3/accesslog.upb.h | 60 +- .../accesslog/v3/accesslog.upb_minitable.c | 48 + .../envoy/config/bootstrap/v3/bootstrap.upb.h | 611 +- .../bootstrap/v3/bootstrap.upb_minitable.c | 187 +- .../bootstrap/v3/bootstrap.upb_minitable.h | 1 + .../config/cluster/v3/circuit_breaker.upb.h | 20 +- .../v3/circuit_breaker.upb_minitable.c | 9 + .../envoy/config/cluster/v3/cluster.upb.h | 451 +- .../config/cluster/v3/cluster.upb_minitable.c | 142 +- .../config/cluster/v3/cluster.upb_minitable.h | 1 + .../envoy/config/cluster/v3/filter.upb.h | 6 +- .../config/cluster/v3/filter.upb_minitable.c | 3 + .../config/cluster/v3/outlier_detection.upb.h | 138 +- .../v3/outlier_detection.upb_minitable.c | 30 +- .../config/common/matcher/v3/matcher.upb.h | 62 +- .../common/matcher/v3/matcher.upb_minitable.c | 45 + .../envoy/config/core/v3/address.upb.h | 46 +- .../config/core/v3/address.upb_minitable.c | 24 + .../envoy/config/core/v3/backoff.upb.h | 4 +- .../config/core/v3/backoff.upb_minitable.c | 3 + .../upb-gen/envoy/config/core/v3/base.upb.h | 714 +- .../envoy/config/core/v3/base.upb_minitable.c | 246 +- .../envoy/config/core/v3/base.upb_minitable.h | 5 + .../envoy/config/core/v3/config_source.upb.h | 42 +- .../core/v3/config_source.upb_minitable.c | 21 + .../config/core/v3/event_service_config.upb.h | 2 +- .../v3/event_service_config.upb_minitable.c | 3 + .../envoy/config/core/v3/extension.upb.h | 4 +- .../config/core/v3/extension.upb_minitable.c | 3 + .../config/core/v3/grpc_method_list.upb.h | 2 +- .../core/v3/grpc_method_list.upb_minitable.c | 6 + .../envoy/config/core/v3/grpc_service.upb.h | 188 +- .../core/v3/grpc_service.upb_minitable.c | 75 +- .../envoy/config/core/v3/health_check.upb.h | 162 +- .../core/v3/health_check.upb_minitable.c | 53 +- .../envoy/config/core/v3/http_service.upb.h | 2 +- .../core/v3/http_service.upb_minitable.c | 3 + .../envoy/config/core/v3/http_uri.upb.h | 6 +- .../config/core/v3/http_uri.upb_minitable.c | 3 + .../envoy/config/core/v3/protocol.upb.h | 204 +- .../config/core/v3/protocol.upb_minitable.c | 76 +- .../envoy/config/core/v3/proxy_protocol.upb.h | 6 +- .../core/v3/proxy_protocol.upb_minitable.c | 6 + .../envoy/config/core/v3/resolver.upb.h | 6 +- .../config/core/v3/resolver.upb_minitable.c | 6 + .../envoy/config/core/v3/socket_option.upb.h | 12 +- .../core/v3/socket_option.upb_minitable.c | 6 + .../core/v3/substitution_format_string.upb.h | 14 +- ...substitution_format_string.upb_minitable.c | 6 + .../config/core/v3/udp_socket_config.upb.h | 4 +- .../core/v3/udp_socket_config.upb_minitable.c | 3 + .../envoy/config/endpoint/v3/endpoint.upb.h | 14 +- .../endpoint/v3/endpoint.upb_minitable.c | 12 + .../endpoint/v3/endpoint_components.upb.h | 88 +- .../v3/endpoint_components.upb_minitable.c | 37 +- .../config/endpoint/v3/load_report.upb.h | 270 +- .../endpoint/v3/load_report.upb_minitable.c | 70 +- .../endpoint/v3/load_report.upb_minitable.h | 1 + .../config/listener/v3/api_listener.upb.h | 2 +- .../listener/v3/api_listener.upb_minitable.c | 3 + .../envoy/config/listener/v3/listener.upb.h | 102 +- .../listener/v3/listener.upb_minitable.c | 43 +- .../listener/v3/listener_components.upb.h | 50 +- .../v3/listener_components.upb_minitable.c | 21 + .../config/listener/v3/quic_config.upb.h | 75 +- .../listener/v3/quic_config.upb_minitable.c | 13 +- .../listener/v3/udp_listener_config.upb.h | 6 +- .../v3/udp_listener_config.upb_minitable.c | 6 + .../config/metrics/v3/metrics_service.upb.h | 10 +- .../v3/metrics_service.upb_minitable.c | 3 + .../envoy/config/metrics/v3/stats.upb.h | 36 +- .../config/metrics/v3/stats.upb_minitable.c | 24 + .../envoy/config/overload/v3/overload.upb.h | 34 +- .../overload/v3/overload.upb_minitable.c | 30 + .../upb-gen/envoy/config/rbac/v3/rbac.upb.h | 97 +- .../envoy/config/rbac/v3/rbac.upb_minitable.c | 43 +- .../upb-gen/envoy/config/route/v3/route.upb.h | 18 +- .../config/route/v3/route.upb_minitable.c | 9 + .../config/route/v3/route_components.upb.h | 502 +- .../route/v3/route_components.upb_minitable.c | 205 +- .../envoy/config/route/v3/scoped_route.upb.h | 12 +- .../route/v3/scoped_route.upb_minitable.c | 9 + .../upb-gen/envoy/config/tap/v3/common.upb.h | 62 +- .../config/tap/v3/common.upb_minitable.c | 36 + .../envoy/config/trace/v3/datadog.upb.h | 121 +- .../config/trace/v3/datadog.upb_minitable.c | 49 +- .../config/trace/v3/datadog.upb_minitable.h | 1 + .../envoy/config/trace/v3/dynamic_ot.upb.h | 4 +- .../trace/v3/dynamic_ot.upb_minitable.c | 3 + .../envoy/config/trace/v3/http_tracer.upb.h | 6 +- .../trace/v3/http_tracer.upb_minitable.c | 6 + .../envoy/config/trace/v3/lightstep.upb.h | 6 +- .../config/trace/v3/lightstep.upb_minitable.c | 3 + .../envoy/config/trace/v3/opencensus.upb.h | 22 +- .../trace/v3/opencensus.upb_minitable.c | 3 + .../envoy/config/trace/v3/opentelemetry.upb.h | 8 +- .../trace/v3/opentelemetry.upb_minitable.c | 3 + .../envoy/config/trace/v3/service.upb.h | 2 +- .../config/trace/v3/service.upb_minitable.c | 3 + .../envoy/config/trace/v3/skywalking.upb.h | 12 +- .../trace/v3/skywalking.upb_minitable.c | 6 + .../upb-gen/envoy/config/trace/v3/xray.upb.h | 12 +- .../config/trace/v3/xray.upb_minitable.c | 6 + .../envoy/config/trace/v3/zipkin.upb.h | 14 +- .../config/trace/v3/zipkin.upb_minitable.c | 3 + .../envoy/data/accesslog/v3/accesslog.upb.h | 212 +- .../accesslog/v3/accesslog.upb_minitable.c | 55 +- .../aggregate/v3/cluster.upb_minitable.c | 3 + .../filters/common/fault/v3/fault.upb.h | 14 +- .../common/fault/v3/fault.upb_minitable.c | 15 + .../filters/http/fault/v3/fault.upb.h | 36 +- .../http/fault/v3/fault.upb_minitable.c | 9 + .../filters/http/gcp_authn/v3/gcp_authn.upb.h | 431 ++ .../gcp_authn/v3/gcp_authn.upb_minitable.c | 129 + .../gcp_authn/v3/gcp_authn.upb_minitable.h | 33 + .../filters/http/rbac/v3/rbac.upb.h | 50 +- .../filters/http/rbac/v3/rbac.upb_minitable.c | 18 +- .../filters/http/router/v3/router.upb.h | 16 +- .../http/router/v3/router.upb_minitable.c | 6 + .../v3/stateful_session.upb.h | 8 +- .../v3/stateful_session.upb_minitable.c | 6 + .../v3/http_connection_manager.upb.h | 276 +- .../http_connection_manager.upb_minitable.c | 84 +- .../stateful_session/cookie/v3/cookie.upb.h | 2 +- .../cookie/v3/cookie.upb_minitable.c | 3 + .../v3/client_side_weighted_round_robin.upb.h | 12 +- ..._side_weighted_round_robin.upb_minitable.c | 3 + .../common/v3/common.upb.h | 20 +- .../common/v3/common.upb_minitable.c | 15 + .../pick_first/v3/pick_first.upb.h | 2 +- .../pick_first/v3/pick_first.upb_minitable.c | 3 + .../ring_hash/v3/ring_hash.upb.h | 14 +- .../ring_hash/v3/ring_hash.upb_minitable.c | 3 + .../wrr_locality/v3/wrr_locality.upb.h | 2 +- .../v3/wrr_locality.upb_minitable.c | 3 + .../transport_sockets/tls/v3/common.upb.h | 138 +- .../tls/v3/common.upb_minitable.c | 50 +- .../tls/v3/common.upb_minitable.h | 1 + .../transport_sockets/tls/v3/secret.upb.h | 16 +- .../tls/v3/secret.upb_minitable.c | 9 + .../transport_sockets/tls/v3/tls.upb.h | 70 +- .../tls/v3/tls.upb_minitable.c | 21 + .../tls/v3/tls_spiffe_validator_config.upb.h | 4 +- ...ls_spiffe_validator_config.upb_minitable.c | 6 + .../http/v3/http_protocol_options.upb.h | 32 +- .../v3/http_protocol_options.upb_minitable.c | 12 + .../service/discovery/v3/ads.upb_minitable.c | 3 + .../service/discovery/v3/discovery.upb.h | 72 +- .../discovery/v3/discovery.upb_minitable.c | 42 + .../envoy/service/load_stats/v3/lrs.upb.h | 8 +- .../service/load_stats/v3/lrs.upb_minitable.c | 6 + .../envoy/service/status/v3/csds.upb.h | 40 +- .../service/status/v3/csds.upb_minitable.c | 15 + .../upb-gen/envoy/type/http/v3/cookie.upb.h | 6 +- .../envoy/type/http/v3/cookie.upb_minitable.c | 3 + .../type/http/v3/path_transformation.upb.h | 4 +- .../v3/path_transformation.upb_minitable.c | 12 + .../envoy/type/matcher/v3/filter_state.upb.h | 4 +- .../matcher/v3/filter_state.upb_minitable.c | 3 + .../envoy/type/matcher/v3/http_inputs.upb.h | 10 +- .../matcher/v3/http_inputs.upb_minitable.c | 15 + .../envoy/type/matcher/v3/metadata.upb.h | 8 +- .../type/matcher/v3/metadata.upb_minitable.c | 6 + .../upb-gen/envoy/type/matcher/v3/node.upb.h | 2 +- .../type/matcher/v3/node.upb_minitable.c | 3 + .../envoy/type/matcher/v3/number.upb.h | 4 +- .../type/matcher/v3/number.upb_minitable.c | 3 + .../upb-gen/envoy/type/matcher/v3/path.upb.h | 2 +- .../type/matcher/v3/path.upb_minitable.c | 3 + .../upb-gen/envoy/type/matcher/v3/regex.upb.h | 10 +- .../type/matcher/v3/regex.upb_minitable.c | 9 + .../v3/status_code_input.upb_minitable.c | 6 + .../envoy/type/matcher/v3/string.upb.h | 43 +- .../type/matcher/v3/string.upb_minitable.c | 23 +- .../envoy/type/matcher/v3/struct.upb.h | 4 +- .../type/matcher/v3/struct.upb_minitable.c | 6 + .../upb-gen/envoy/type/matcher/v3/value.upb.h | 16 +- .../type/matcher/v3/value.upb_minitable.c | 12 + .../envoy/type/metadata/v3/metadata.upb.h | 12 +- .../type/metadata/v3/metadata.upb_minitable.c | 21 + .../envoy/type/tracing/v3/custom_tag.upb.h | 26 +- .../tracing/v3/custom_tag.upb_minitable.c | 15 + .../upb-gen/envoy/type/v3/hash_policy.upb.h | 6 +- .../envoy/type/v3/hash_policy.upb_minitable.c | 9 + .../upb-gen/envoy/type/v3/http_status.upb.h | 2 +- .../envoy/type/v3/http_status.upb_minitable.c | 3 + .../ext/upb-gen/envoy/type/v3/percent.upb.h | 6 +- .../envoy/type/v3/percent.upb_minitable.c | 6 + .../ext/upb-gen/envoy/type/v3/range.upb.h | 12 +- .../envoy/type/v3/range.upb_minitable.c | 9 + .../envoy/type/v3/ratelimit_strategy.upb.h | 10 +- .../v3/ratelimit_strategy.upb_minitable.c | 6 + .../envoy/type/v3/semantic_version.upb.h | 6 +- .../type/v3/semantic_version.upb_minitable.c | 3 + .../upb-gen/envoy/type/v3/token_bucket.upb.h | 6 +- .../type/v3/token_bucket.upb_minitable.c | 3 + .../ext/upb-gen/google/api/annotations.upb.h | 11 +- .../google/api/expr/v1alpha1/checked.upb.h | 80 +- .../api/expr/v1alpha1/checked.upb_minitable.c | 54 +- .../google/api/expr/v1alpha1/syntax.upb.h | 505 +- .../api/expr/v1alpha1/syntax.upb_minitable.c | 156 +- .../api/expr/v1alpha1/syntax.upb_minitable.h | 2 + .../core/ext/upb-gen/google/api/http.upb.h | 24 +- .../upb-gen/google/api/http.upb_minitable.c | 9 + .../ext/upb-gen/google/api/httpbody.upb.h | 4 +- .../google/api/httpbody.upb_minitable.c | 3 + .../ext/upb-gen/google/protobuf/any.upb.h | 4 +- .../google/protobuf/any.upb_minitable.c | 3 + .../upb-gen/google/protobuf/descriptor.upb.h | 558 +- .../protobuf/descriptor.upb_minitable.c | 170 +- .../protobuf/descriptor.upb_minitable.h | 1 + .../upb-gen/google/protobuf/duration.upb.h | 4 +- .../google/protobuf/duration.upb_minitable.c | 3 + .../google/protobuf/empty.upb_minitable.c | 3 + .../ext/upb-gen/google/protobuf/struct.upb.h | 12 +- .../google/protobuf/struct.upb_minitable.c | 12 + .../upb-gen/google/protobuf/timestamp.upb.h | 4 +- .../google/protobuf/timestamp.upb_minitable.c | 3 + .../upb-gen/google/protobuf/wrappers.upb.h | 18 +- .../google/protobuf/wrappers.upb_minitable.c | 27 + .../core/ext/upb-gen/google/rpc/status.upb.h | 4 +- .../upb-gen/google/rpc/status.upb_minitable.c | 3 + .../proto/trace/v1/trace_config.upb.h | 20 +- .../trace/v1/trace_config.upb_minitable.c | 12 + .../src/proto/grpc/gcp/altscontext.upb.h | 12 +- .../grpc/gcp/altscontext.upb_minitable.c | 6 + .../src/proto/grpc/gcp/handshaker.upb.h | 70 +- .../proto/grpc/gcp/handshaker.upb_minitable.c | 36 + .../grpc/gcp/transport_security_common.upb.h | 8 +- .../transport_security_common.upb_minitable.c | 6 + .../src/proto/grpc/health/v1/health.upb.h | 4 +- .../grpc/health/v1/health.upb_minitable.c | 6 + .../src/proto/grpc/lb/v1/load_balancer.upb.h | 36 +- .../grpc/lb/v1/load_balancer.upb_minitable.c | 27 + .../src/proto/grpc/lookup/v1/rls.upb.h | 8 +- .../proto/grpc/lookup/v1/rls.upb_minitable.c | 9 + .../src/proto/grpc/lookup/v1/rls_config.upb.h | 30 +- .../grpc/lookup/v1/rls_config.upb_minitable.c | 27 + .../upb-gen/udpa/annotations/migrate.upb.h | 63 +- .../udpa/annotations/migrate.upb_minitable.c | 9 + .../upb-gen/udpa/annotations/security.upb.h | 15 +- .../udpa/annotations/security.upb_minitable.c | 3 + .../upb-gen/udpa/annotations/sensitive.upb.h | 2 +- .../ext/upb-gen/udpa/annotations/status.upb.h | 15 +- .../udpa/annotations/status.upb_minitable.c | 3 + .../upb-gen/udpa/annotations/versioning.upb.h | 13 +- .../annotations/versioning.upb_minitable.c | 3 + .../core/ext/upb-gen/validate/validate.upb.h | 341 +- .../upb-gen/validate/validate.upb_minitable.c | 69 + .../upb-gen/xds/annotations/v3/migrate.upb.h | 63 +- .../annotations/v3/migrate.upb_minitable.c | 9 + .../upb-gen/xds/annotations/v3/security.upb.h | 15 +- .../annotations/v3/security.upb_minitable.c | 3 + .../xds/annotations/v3/sensitive.upb.h | 2 +- .../upb-gen/xds/annotations/v3/status.upb.h | 43 +- .../xds/annotations/v3/status.upb_minitable.c | 12 + .../xds/annotations/v3/versioning.upb.h | 13 +- .../annotations/v3/versioning.upb_minitable.c | 3 + .../ext/upb-gen/xds/core/v3/authority.upb.h | 2 +- .../xds/core/v3/authority.upb_minitable.c | 3 + .../core/ext/upb-gen/xds/core/v3/cidr.upb.h | 4 +- .../upb-gen/xds/core/v3/cidr.upb_minitable.c | 3 + .../xds/core/v3/collection_entry.upb.h | 10 +- .../core/v3/collection_entry.upb_minitable.c | 6 + .../core/v3/context_params.upb_minitable.c | 6 + .../ext/upb-gen/xds/core/v3/extension.upb.h | 4 +- .../xds/core/v3/extension.upb_minitable.c | 3 + .../ext/upb-gen/xds/core/v3/resource.upb.h | 6 +- .../xds/core/v3/resource.upb_minitable.c | 3 + .../xds/core/v3/resource_locator.upb.h | 14 +- .../core/v3/resource_locator.upb_minitable.c | 6 + .../upb-gen/xds/core/v3/resource_name.upb.h | 8 +- .../xds/core/v3/resource_name.upb_minitable.c | 3 + .../xds/data/orca/v3/orca_load_report.upb.h | 12 +- .../orca/v3/orca_load_report.upb_minitable.c | 12 + .../upb-gen/xds/service/orca/v3/orca.upb.h | 2 +- .../xds/service/orca/v3/orca.upb_minitable.c | 3 + .../ext/upb-gen/xds/type/matcher/v3/cel.upb.h | 4 +- .../xds/type/matcher/v3/cel.upb_minitable.c | 3 + .../upb-gen/xds/type/matcher/v3/domain.upb.h | 2 +- .../type/matcher/v3/domain.upb_minitable.c | 6 + .../matcher/v3/http_inputs.upb_minitable.c | 3 + .../ext/upb-gen/xds/type/matcher/v3/ip.upb.h | 4 +- .../xds/type/matcher/v3/ip.upb_minitable.c | 6 + .../upb-gen/xds/type/matcher/v3/matcher.upb.h | 36 +- .../type/matcher/v3/matcher.upb_minitable.c | 30 + .../upb-gen/xds/type/matcher/v3/range.upb.h | 6 +- .../xds/type/matcher/v3/range.upb_minitable.c | 18 + .../upb-gen/xds/type/matcher/v3/regex.upb.h | 4 +- .../xds/type/matcher/v3/regex.upb_minitable.c | 6 + .../upb-gen/xds/type/matcher/v3/string.upb.h | 12 +- .../type/matcher/v3/string.upb_minitable.c | 6 + .../core/ext/upb-gen/xds/type/v3/cel.upb.h | 8 +- .../upb-gen/xds/type/v3/cel.upb_minitable.c | 6 + .../core/ext/upb-gen/xds/type/v3/range.upb.h | 12 +- .../upb-gen/xds/type/v3/range.upb_minitable.c | 9 + .../upb-gen/xds/type/v3/typed_struct.upb.h | 4 +- .../xds/type/v3/typed_struct.upb_minitable.c | 3 + .../envoy/admin/v3/server_info.upbdefs.c | 167 +- .../config/accesslog/v3/accesslog.upbdefs.c | 121 +- .../config/bootstrap/v3/bootstrap.upbdefs.c | 431 +- .../config/bootstrap/v3/bootstrap.upbdefs.h | 5 + .../envoy/config/cluster/v3/cluster.upbdefs.c | 614 +- .../envoy/config/cluster/v3/cluster.upbdefs.h | 5 + .../cluster/v3/outlier_detection.upbdefs.c | 219 +- .../envoy/config/core/v3/base.upbdefs.c | 325 +- .../envoy/config/core/v3/base.upbdefs.h | 25 + .../config/core/v3/config_source.upbdefs.c | 21 +- .../config/core/v3/grpc_service.upbdefs.c | 337 +- .../config/core/v3/health_check.upbdefs.c | 384 +- .../envoy/config/core/v3/protocol.upbdefs.c | 451 +- .../endpoint/v3/endpoint_components.upbdefs.c | 75 +- .../config/endpoint/v3/load_report.upbdefs.c | 215 +- .../config/endpoint/v3/load_report.upbdefs.h | 5 + .../config/listener/v3/listener.upbdefs.c | 80 +- .../config/listener/v3/quic_config.upbdefs.c | 32 +- .../envoy/config/rbac/v3/rbac.upbdefs.c | 134 +- .../route/v3/route_components.upbdefs.c | 1215 +-- .../envoy/config/trace/v3/datadog.upbdefs.c | 50 +- .../envoy/config/trace/v3/datadog.upbdefs.h | 5 + .../config/trace/v3/dynamic_ot.upbdefs.c | 35 +- .../config/trace/v3/opencensus.upbdefs.c | 121 +- .../envoy/config/trace/v3/zipkin.upbdefs.c | 41 +- .../data/accesslog/v3/accesslog.upbdefs.c | 287 +- .../http/gcp_authn/v3/gcp_authn.upbdefs.c | 86 + .../http/gcp_authn/v3/gcp_authn.upbdefs.h | 47 + .../filters/http/rbac/v3/rbac.upbdefs.c | 69 +- .../v3/http_connection_manager.upbdefs.c | 578 +- .../transport_sockets/tls/v3/common.upbdefs.c | 157 +- .../transport_sockets/tls/v3/common.upbdefs.h | 5 + .../envoy/type/matcher/v3/string.upbdefs.c | 72 +- .../api/expr/v1alpha1/checked.upbdefs.c | 215 +- .../google/api/expr/v1alpha1/syntax.upbdefs.c | 179 +- .../google/api/expr/v1alpha1/syntax.upbdefs.h | 10 + .../google/protobuf/descriptor.upbdefs.c | 537 +- .../google/protobuf/descriptor.upbdefs.h | 5 + .../endpoint_info/endpoint_info_handshaker.cc | 16 +- deps/grpc/src/core/handshaker/handshaker.cc | 261 +- deps/grpc/src/core/handshaker/handshaker.h | 94 +- .../http_connect/http_connect_handshaker.cc | 239 +- .../http_connect/http_proxy_mapper.cc | 29 +- .../handshaker/security/secure_endpoint.cc | 97 +- .../handshaker/security/secure_endpoint.h | 8 +- .../security/security_handshaker.cc | 302 +- .../tcp_connect/tcp_connect_handshaker.cc | 86 +- deps/grpc/src/core/lib/backoff/backoff.cc | 17 +- deps/grpc/src/core/lib/backoff/backoff.h | 10 +- deps/grpc/src/core/lib/channel/channel_args.h | 5 + .../src/core/lib/channel/channel_stack.cc | 12 +- .../grpc/src/core/lib/channel/channel_stack.h | 15 +- .../lib/channel/channel_stack_builder_impl.cc | 1 - .../src/core/lib/channel/connected_channel.cc | 5 +- .../core/lib/channel/promise_based_filter.cc | 373 +- .../core/lib/channel/promise_based_filter.h | 26 +- .../src/core/lib/compression/compression.cc | 6 +- .../lib/compression/compression_internal.cc | 1 - deps/grpc/src/core/lib/config/config_vars.cc | 21 +- deps/grpc/src/core/lib/config/config_vars.h | 14 +- .../grpc/src/core/lib/config/config_vars.yaml | 10 +- .../src/core/lib/config/core_configuration.cc | 1 - .../src/core/lib/config/core_configuration.h | 1 - deps/grpc/src/core/lib/debug/event_log.cc | 1 - deps/grpc/src/core/lib/debug/trace.cc | 3 +- deps/grpc/src/core/lib/debug/trace_flags.cc | 24 +- deps/grpc/src/core/lib/debug/trace_flags.h | 8 +- deps/grpc/src/core/lib/debug/trace_flags.yaml | 31 +- deps/grpc/src/core/lib/debug/trace_impl.h | 10 + .../core/lib/event_engine/ares_resolver.cc | 192 +- .../src/core/lib/event_engine/ares_resolver.h | 16 +- .../lib/event_engine/cf_engine/cf_engine.cc | 21 +- .../cf_engine/cfstream_endpoint.cc | 72 +- .../cf_engine/cftype_unique_ref.h | 2 +- .../cf_engine/dns_service_resolver.cc | 1 - .../lib/event_engine/default_event_engine.cc | 13 +- .../src/core/lib/event_engine/event_engine.cc | 10 +- .../lib/event_engine/event_engine_context.h | 6 +- .../src/core/lib/event_engine/forkable.cc | 1 - .../grpc/src/core/lib/event_engine/forkable.h | 1 - .../posix_engine/ev_epoll1_linux.cc | 2 +- .../posix_engine/ev_epoll1_linux.h | 8 +- .../posix_engine/ev_poll_posix.cc | 1 - .../posix_engine/lockfree_event.cc | 1 - .../posix_engine/posix_endpoint.cc | 72 +- .../posix_engine/posix_endpoint.h | 1 - .../event_engine/posix_engine/posix_engine.cc | 28 +- .../posix_engine/posix_engine_listener.cc | 6 +- .../posix_engine/posix_engine_listener.h | 4 +- .../posix_engine/tcp_socket_utils.cc | 27 +- .../posix_engine/tcp_socket_utils.h | 5 +- .../posix_engine/timer_manager.cc | 22 +- .../posix_engine/traced_buffer_list.cc | 1 - .../core/lib/event_engine/resolved_address.cc | 1 - deps/grpc/src/core/lib/event_engine/slice.cc | 1 - .../event_engine/thread_pool/thread_count.cc | 6 +- .../thread_pool/work_stealing_thread_pool.cc | 30 +- .../thready_event_engine.cc | 38 +- deps/grpc/src/core/lib/event_engine/trace.h | 37 - .../windows/grpc_polled_fd_windows.cc | 214 +- .../src/core/lib/event_engine/windows/iocp.cc | 19 +- .../lib/event_engine/windows/win_socket.cc | 26 +- .../event_engine/windows/windows_endpoint.cc | 18 +- .../event_engine/windows/windows_engine.cc | 75 +- .../event_engine/windows/windows_listener.cc | 19 +- deps/grpc/src/core/lib/experiments/config.cc | 62 +- deps/grpc/src/core/lib/experiments/config.h | 56 +- .../src/core/lib/experiments/experiments.cc | 177 +- .../src/core/lib/experiments/experiments.h | 123 +- .../src/core/lib/experiments/experiments.yaml | 85 +- .../src/core/lib/experiments/rollouts.yaml | 14 +- deps/grpc/src/core/lib/gprpp/bitset.h | 2 +- deps/grpc/src/core/lib/gprpp/chunked_vector.h | 1 - .../src/core/lib/gprpp/construct_destruct.h | 4 +- deps/grpc/src/core/lib/gprpp/debug_location.h | 7 + deps/grpc/src/core/lib/gprpp/down_cast.h | 5 +- deps/grpc/src/core/lib/gprpp/dump_args.cc | 16 +- deps/grpc/src/core/lib/gprpp/dump_args.h | 54 +- deps/grpc/src/core/lib/gprpp/host_port.cc | 1 - deps/grpc/src/core/lib/gprpp/load_file.cc | 1 - deps/grpc/src/core/lib/gprpp/mpscq.h | 1 - deps/grpc/src/core/lib/gprpp/single_set_ptr.h | 1 - deps/grpc/src/core/lib/gprpp/status_helper.cc | 3 +- deps/grpc/src/core/lib/gprpp/sync.h | 1 - deps/grpc/src/core/lib/gprpp/table.h | 66 +- deps/grpc/src/core/lib/gprpp/thd.h | 1 - deps/grpc/src/core/lib/gprpp/time.h | 30 +- deps/grpc/src/core/lib/gprpp/time_util.cc | 1 - .../src/core/lib/gprpp/unique_type_name.h | 36 +- .../lib/gprpp/windows/directory_reader.cc | 2 - deps/grpc/src/core/lib/gprpp/windows/thd.cc | 1 - .../src/core/lib/gprpp/work_serializer.cc | 64 +- deps/grpc/src/core/lib/iomgr/buffer_list.cc | 1 - deps/grpc/src/core/lib/iomgr/call_combiner.cc | 72 +- deps/grpc/src/core/lib/iomgr/call_combiner.h | 14 +- .../src/core/lib/iomgr/cfstream_handle.cc | 26 +- deps/grpc/src/core/lib/iomgr/closure.h | 15 +- deps/grpc/src/core/lib/iomgr/combiner.cc | 69 +- deps/grpc/src/core/lib/iomgr/endpoint.h | 2 + .../src/core/lib/iomgr/endpoint_cfstream.cc | 57 +- .../src/core/lib/iomgr/endpoint_pair_posix.cc | 1 - deps/grpc/src/core/lib/iomgr/error.cc | 6 +- deps/grpc/src/core/lib/iomgr/error.h | 1 - deps/grpc/src/core/lib/iomgr/ev_apple.cc | 31 +- .../src/core/lib/iomgr/ev_epoll1_linux.cc | 147 +- deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc | 41 +- deps/grpc/src/core/lib/iomgr/ev_posix.cc | 102 +- deps/grpc/src/core/lib/iomgr/ev_posix.h | 5 - .../lib/iomgr/event_engine_shims/closure.cc | 18 +- .../lib/iomgr/event_engine_shims/endpoint.cc | 23 +- .../iomgr/event_engine_shims/tcp_client.cc | 17 +- deps/grpc/src/core/lib/iomgr/exec_ctx.cc | 17 +- deps/grpc/src/core/lib/iomgr/exec_ctx.h | 42 +- deps/grpc/src/core/lib/iomgr/executor.cc | 79 +- deps/grpc/src/core/lib/iomgr/fork_windows.cc | 1 - .../src/core/lib/iomgr/internal_errqueue.cc | 1 - deps/grpc/src/core/lib/iomgr/iocp_windows.cc | 1 - deps/grpc/src/core/lib/iomgr/iomgr_windows.cc | 2 - .../grpc/src/core/lib/iomgr/lockfree_event.cc | 23 +- .../grpc/src/core/lib/iomgr/polling_entity.cc | 13 +- .../src/core/lib/iomgr/pollset_windows.cc | 2 - .../src/core/lib/iomgr/resolve_address.cc | 1 - .../core/lib/iomgr/resolve_address_posix.cc | 1 - .../core/lib/iomgr/resolve_address_windows.cc | 1 - .../core/lib/iomgr/sockaddr_utils_posix.cc | 1 - .../grpc/src/core/lib/iomgr/socket_mutator.cc | 1 - .../lib/iomgr/socket_utils_common_posix.cc | 26 +- .../src/core/lib/iomgr/socket_utils_linux.cc | 2 - .../src/core/lib/iomgr/socket_utils_posix.cc | 1 - .../core/lib/iomgr/socket_utils_windows.cc | 2 - .../src/core/lib/iomgr/tcp_client_cfstream.cc | 22 +- .../src/core/lib/iomgr/tcp_client_posix.cc | 21 +- .../src/core/lib/iomgr/tcp_client_windows.cc | 1 - deps/grpc/src/core/lib/iomgr/tcp_posix.cc | 126 +- .../src/core/lib/iomgr/tcp_server_posix.cc | 57 +- deps/grpc/src/core/lib/iomgr/tcp_windows.cc | 28 +- deps/grpc/src/core/lib/iomgr/timer_generic.cc | 146 +- deps/grpc/src/core/lib/iomgr/timer_manager.cc | 13 +- .../src/core/lib/iomgr/unix_sockets_posix.cc | 1 - .../core/lib/iomgr/unix_sockets_posix_noop.cc | 2 - deps/grpc/src/core/lib/iomgr/vsock.cc | 1 - .../src/core/lib/iomgr/wakeup_fd_eventfd.cc | 2 - deps/grpc/src/core/lib/promise/activity.h | 16 +- deps/grpc/src/core/lib/promise/all_ok.h | 23 +- .../src/core/lib/promise/cancel_callback.h | 18 +- deps/grpc/src/core/lib/promise/context.h | 15 +- .../src/core/lib/promise/detail/join_state.h | 1085 ++- .../core/lib/promise/detail/promise_factory.h | 71 +- .../core/lib/promise/detail/promise_like.h | 19 +- .../src/core/lib/promise/detail/seq_state.h | 3279 ++++---- .../grpc/src/core/lib/promise/detail/status.h | 47 +- deps/grpc/src/core/lib/promise/for_each.h | 58 +- deps/grpc/src/core/lib/promise/if.h | 34 +- .../core/lib/promise/inter_activity_latch.h | 24 +- .../src/core/lib/promise/interceptor_list.h | 47 +- deps/grpc/src/core/lib/promise/join.h | 21 +- deps/grpc/src/core/lib/promise/latch.h | 47 +- deps/grpc/src/core/lib/promise/loop.h | 21 +- deps/grpc/src/core/lib/promise/map.h | 19 +- deps/grpc/src/core/lib/promise/map_pipe.h | 1 - deps/grpc/src/core/lib/promise/mpsc.h | 65 +- deps/grpc/src/core/lib/promise/party.cc | 407 +- deps/grpc/src/core/lib/promise/party.h | 466 +- deps/grpc/src/core/lib/promise/pipe.h | 8 +- deps/grpc/src/core/lib/promise/poll.h | 133 +- deps/grpc/src/core/lib/promise/promise.h | 16 +- .../grpc/src/core/lib/promise/promise_mutex.h | 1 - deps/grpc/src/core/lib/promise/race.h | 15 +- deps/grpc/src/core/lib/promise/seq.h | 87 +- deps/grpc/src/core/lib/promise/status_flag.h | 194 +- deps/grpc/src/core/lib/promise/try_join.h | 52 +- deps/grpc/src/core/lib/promise/try_seq.h | 129 +- .../grpc/src/core/lib/resource_quota/arena.cc | 36 +- deps/grpc/src/core/lib/resource_quota/arena.h | 40 +- .../lib/resource_quota/connection_quota.cc | 1 - .../core/lib/resource_quota/memory_quota.cc | 45 +- .../core/lib/resource_quota/memory_quota.h | 7 +- .../core/lib/resource_quota/thread_quota.cc | 1 - .../security/authorization/audit_logging.cc | 1 - .../grpc_authorization_engine.cc | 1 - .../grpc_authorization_policy_provider.cc | 19 +- .../authorization/grpc_server_authz_filter.cc | 41 +- .../authorization/grpc_server_authz_filter.h | 2 + .../security/authorization/rbac_translator.cc | 1 - .../security/authorization/stdout_logger.cc | 1 - .../lib/security/context/security_context.cc | 59 +- .../credentials/alts/check_gcp_environment.cc | 3 +- .../alts/check_gcp_environment_no_op.cc | 2 +- .../alts/check_gcp_environment_windows.cc | 1 - .../security/credentials/call_creds_util.cc | 1 - .../composite/composite_credentials.cc | 17 +- .../composite/composite_credentials.h | 2 + .../lib/security/credentials/credentials.cc | 20 +- .../lib/security/credentials/credentials.h | 3 +- .../aws_external_account_credentials.cc | 646 +- .../aws_external_account_credentials.h | 95 +- .../external/external_account_credentials.cc | 744 +- .../external/external_account_credentials.h | 172 +- .../file_external_account_credentials.cc | 127 +- .../file_external_account_credentials.h | 34 +- .../url_external_account_credentials.cc | 207 +- .../url_external_account_credentials.h | 31 +- .../credentials/fake/fake_credentials.h | 2 + ...cp_service_account_identity_credentials.cc | 196 + ...gcp_service_account_identity_credentials.h | 90 + .../google_default_credentials.cc | 73 +- .../credentials/iam/iam_credentials.cc | 9 +- .../credentials/iam/iam_credentials.h | 2 + .../security/credentials/jwt/json_token.cc | 2 +- .../credentials/jwt/jwt_credentials.cc | 22 +- .../credentials/jwt/jwt_credentials.h | 2 + .../credentials/oauth2/oauth2_credentials.cc | 448 +- .../credentials/oauth2/oauth2_credentials.h | 90 +- .../credentials/plugin/plugin_credentials.cc | 41 +- .../credentials/plugin/plugin_credentials.h | 2 + .../credentials/ssl/ssl_credentials.cc | 36 +- .../credentials/ssl/ssl_credentials.h | 1 - .../tls/grpc_tls_certificate_distributor.cc | 1 - .../tls/grpc_tls_certificate_provider.cc | 11 +- .../tls/grpc_tls_certificate_provider.h | 1 - .../tls/grpc_tls_certificate_verifier.cc | 6 +- .../tls/grpc_tls_certificate_verifier.h | 1 - .../tls/grpc_tls_credentials_options.cc | 12 +- .../credentials/tls/tls_credentials.cc | 4 +- .../token_fetcher_credentials.cc | 298 + .../token_fetcher/token_fetcher_credentials.h | 176 + .../credentials/xds/xds_credentials.cc | 21 +- .../fake/fake_security_connector.cc | 1 - .../insecure/insecure_security_connector.cc | 1 - .../load_system_roots_windows.cc | 1 - .../security_connector/security_connector.cc | 6 +- .../security/security_connector/ssl_utils.cc | 15 +- .../lib/security/transport/auth_filters.h | 4 + .../security/transport/client_auth_filter.cc | 3 +- .../security/transport/server_auth_filter.cc | 21 +- .../src/core/lib/slice/percent_encoding.cc | 1 - deps/grpc/src/core/lib/slice/slice.cc | 1 - deps/grpc/src/core/lib/slice/slice.h | 1 - deps/grpc/src/core/lib/slice/slice_buffer.cc | 1 - deps/grpc/src/core/lib/slice/slice_internal.h | 1 - deps/grpc/src/core/lib/slice/slice_refcount.h | 16 +- deps/grpc/src/core/lib/surface/api_trace.h | 50 - .../core/lib/surface/byte_buffer_reader.cc | 1 - deps/grpc/src/core/lib/surface/call.cc | 68 +- deps/grpc/src/core/lib/surface/call.h | 46 +- .../grpc/src/core/lib/surface/call_details.cc | 7 +- .../src/core/lib/surface/call_log_batch.cc | 9 +- deps/grpc/src/core/lib/surface/call_utils.cc | 12 +- deps/grpc/src/core/lib/surface/call_utils.h | 1 - deps/grpc/src/core/lib/surface/channel.cc | 67 +- .../src/core/lib/surface/channel_create.cc | 22 +- .../grpc/src/core/lib/surface/channel_init.cc | 453 +- deps/grpc/src/core/lib/surface/channel_init.h | 178 +- deps/grpc/src/core/lib/surface/client_call.cc | 54 +- deps/grpc/src/core/lib/surface/client_call.h | 25 +- .../src/core/lib/surface/completion_queue.cc | 147 +- .../lib/surface/completion_queue_factory.cc | 1 - .../src/core/lib/surface/filter_stack_call.cc | 47 +- .../src/core/lib/surface/filter_stack_call.h | 1 - deps/grpc/src/core/lib/surface/init.cc | 32 +- deps/grpc/src/core/lib/surface/lame_client.cc | 4 +- deps/grpc/src/core/lib/surface/lame_client.h | 2 + .../src/core/lib/surface/legacy_channel.cc | 16 +- .../src/core/lib/surface/metadata_array.cc | 7 +- deps/grpc/src/core/lib/surface/server_call.cc | 3 +- deps/grpc/src/core/lib/surface/server_call.h | 15 +- .../src/core/lib/surface/validate_metadata.h | 1 - deps/grpc/src/core/lib/surface/version.cc | 4 +- .../src/core/lib/transport/bdp_estimator.cc | 25 +- .../src/core/lib/transport/bdp_estimator.h | 16 +- .../lib/transport/call_arena_allocator.cc | 18 +- .../core/lib/transport/call_arena_allocator.h | 27 +- .../src/core/lib/transport/call_filters.cc | 394 +- .../src/core/lib/transport/call_filters.h | 1117 +-- .../grpc/src/core/lib/transport/call_spine.cc | 171 +- deps/grpc/src/core/lib/transport/call_spine.h | 133 +- .../grpc/src/core/lib/transport/call_state.cc | 39 + deps/grpc/src/core/lib/transport/call_state.h | 957 +++ .../core/lib/transport/connectivity_state.cc | 77 +- .../core/lib/transport/interception_chain.cc | 20 +- .../core/lib/transport/interception_chain.h | 60 +- deps/grpc/src/core/lib/transport/metadata.cc | 30 +- deps/grpc/src/core/lib/transport/metadata.h | 39 +- .../src/core/lib/transport/metadata_batch.h | 47 +- .../core/lib/transport/promise_endpoint.cc | 1 - .../src/core/lib/transport/promise_endpoint.h | 1 - .../core/lib/transport/timeout_encoding.cc | 1 - deps/grpc/src/core/lib/transport/transport.h | 20 +- .../core/lib/transport/transport_op_string.cc | 1 - deps/grpc/src/core/lib/uri/uri_parser.cc | 1 - .../load_balancing/child_policy_handler.cc | 51 +- .../grpclb/client_load_reporting_filter.cc | 3 +- .../grpclb/client_load_reporting_filter.h | 3 + .../src/core/load_balancing/grpclb/grpclb.cc | 257 +- .../load_balancing/health_check_client.cc | 97 +- deps/grpc/src/core/load_balancing/lb_policy.h | 64 +- .../core/load_balancing/oob_backend_metric.cc | 10 +- .../outlier_detection/outlier_detection.cc | 268 +- .../load_balancing/pick_first/pick_first.cc | 452 +- .../core/load_balancing/priority/priority.cc | 196 +- .../load_balancing/ring_hash/ring_hash.cc | 96 +- deps/grpc/src/core/load_balancing/rls/rls.cc | 553 +- .../load_balancing/round_robin/round_robin.cc | 108 +- .../load_balancing/subchannel_interface.h | 4 + .../static_stride_scheduler.cc | 1 - .../weighted_round_robin.cc | 212 +- .../weighted_target/weighted_target.cc | 143 +- deps/grpc/src/core/load_balancing/xds/cds.cc | 71 +- .../load_balancing/xds/xds_cluster_impl.cc | 236 +- .../load_balancing/xds/xds_cluster_manager.cc | 106 +- .../load_balancing/xds/xds_override_host.cc | 259 +- .../load_balancing/xds/xds_wrr_locality.cc | 55 +- .../grpc_plugin_registry_extra.cc | 3 + .../core/resolver/binder/binder_resolver.cc | 2 - .../resolver/dns/c_ares/dns_resolver_ares.cc | 115 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 2 - .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 199 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 266 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 9 +- .../core/resolver/dns/dns_resolver_plugin.cc | 1 - .../event_engine_client_channel_resolver.cc | 80 +- .../core/resolver/dns/native/dns_resolver.cc | 23 +- .../src/core/resolver/endpoint_addresses.cc | 1 - .../src/core/resolver/endpoint_addresses.h | 3 + .../src/core/resolver/fake/fake_resolver.cc | 1 - .../src/core/resolver/polling_resolver.cc | 21 +- .../grpc/src/core/resolver/polling_resolver.h | 2 +- deps/grpc/src/core/resolver/resolver.h | 3 - deps/grpc/src/core/resolver/xds/xds_config.cc | 96 + deps/grpc/src/core/resolver/xds/xds_config.h | 109 + .../resolver/xds/xds_dependency_manager.cc | 247 +- .../resolver/xds/xds_dependency_manager.h | 74 +- .../src/core/resolver/xds/xds_resolver.cc | 187 +- .../resolver/xds/xds_resolver_attributes.h | 6 +- deps/grpc/src/core/server/server.cc | 152 +- .../core/server/server_call_tracer_filter.cc | 5 +- .../server/server_config_selector_filter.cc | 9 +- .../core/server/xds_channel_stack_modifier.cc | 2 +- .../core/server/xds_server_config_fetcher.cc | 88 +- .../service_config/service_config_call_data.h | 8 +- .../service_config_channel_arg_filter.cc | 6 +- .../core/service_config/service_config_impl.h | 1 - deps/grpc/src/core/telemetry/call_tracer.cc | 35 +- deps/grpc/src/core/telemetry/call_tracer.h | 15 + deps/grpc/src/core/telemetry/metrics.h | 22 +- deps/grpc/src/core/telemetry/stats_data.cc | 67 + deps/grpc/src/core/telemetry/stats_data.h | 48 + deps/grpc/src/core/telemetry/stats_data.yaml | 8 + .../tsi/alts/frame_protector/frame_handler.cc | 15 +- .../alts/handshaker/alts_handshaker_client.cc | 18 +- .../alts/handshaker/alts_shared_resource.cc | 1 - .../alts/handshaker/alts_tsi_handshaker.cc | 15 +- .../transport_security_common_api.cc | 34 +- .../transport_security_common_api.h | 1 - ...lts_grpc_integrity_only_record_protocol.cc | 14 +- ..._grpc_privacy_integrity_record_protocol.cc | 14 +- .../alts_grpc_record_protocol_common.cc | 10 +- .../alts_iovec_record_protocol.cc | 1 - .../alts_zero_copy_grpc_protector.cc | 9 +- .../src/core/tsi/fake_transport_security.cc | 19 +- .../tsi/ssl/key_logging/ssl_key_logging.cc | 12 +- .../ssl/session_cache/ssl_session_cache.cc | 1 - .../src/core/tsi/ssl_transport_security.cc | 73 +- .../core/tsi/ssl_transport_security_utils.cc | 7 +- deps/grpc/src/core/util/alloc.cc | 1 - deps/grpc/src/core/util/android/log.cc | 60 - deps/grpc/src/core/util/gcp_metadata_query.cc | 1 - .../grpc/src/core/util/http_client/httpcli.cc | 81 +- deps/grpc/src/core/util/http_client/httpcli.h | 34 +- deps/grpc/src/core/util/http_client/parser.cc | 9 +- deps/grpc/src/core/util/json/json_reader.cc | 1 - deps/grpc/src/core/util/latent_see.cc | 133 + deps/grpc/src/core/util/latent_see.h | 309 + deps/grpc/src/core/util/linux/cpu.cc | 15 +- deps/grpc/src/core/util/linux/log.cc | 69 - deps/grpc/src/core/util/log.cc | 101 +- deps/grpc/src/core/util/lru_cache.h | 104 + deps/grpc/src/core/util/msys/tmpfile.cc | 1 - deps/grpc/src/core/util/posix/cpu.cc | 5 +- deps/grpc/src/core/util/posix/log.cc | 69 - deps/grpc/src/core/util/posix/sync.cc | 1 - deps/grpc/src/core/util/posix/time.cc | 1 - deps/grpc/src/core/util/posix/tmpfile.cc | 10 +- deps/grpc/src/core/util/ring_buffer.h | 123 + deps/grpc/src/core/util/spinlock.h | 3 +- deps/grpc/src/core/util/string.cc | 14 +- deps/grpc/src/core/util/subprocess_posix.cc | 14 +- deps/grpc/src/core/util/subprocess_windows.cc | 1 - deps/grpc/src/core/util/sync.cc | 1 - deps/grpc/src/core/util/sync_abseil.cc | 1 - deps/grpc/src/core/util/time.cc | 1 - deps/grpc/src/core/util/time_precise.cc | 7 +- .../src/core/util/unique_ptr_with_bitset.h | 86 + .../src/core/{xds/grpc => util}/upb_utils.h | 8 +- deps/grpc/src/core/util/useful.h | 69 +- deps/grpc/src/core/util/windows/cpu.cc | 1 - deps/grpc/src/core/util/windows/log.cc | 73 - deps/grpc/src/core/util/windows/sync.cc | 1 - deps/grpc/src/core/util/windows/time.cc | 1 - deps/grpc/src/core/util/windows/tmpfile.cc | 1 - .../xds/grpc/xds_audit_logger_registry.cc | 1 + .../src/core/xds/grpc/xds_bootstrap_grpc.cc | 157 - .../src/core/xds/grpc/xds_bootstrap_grpc.h | 34 +- .../core/xds/grpc/xds_certificate_provider.cc | 4 +- .../core/xds/grpc/xds_certificate_provider.h | 4 +- .../grpc/src/core/xds/grpc/xds_client_grpc.cc | 38 +- deps/grpc/src/core/xds/grpc/xds_cluster.cc | 733 +- deps/grpc/src/core/xds/grpc/xds_cluster.h | 47 +- .../src/core/xds/grpc/xds_cluster_parser.cc | 692 ++ .../src/core/xds/grpc/xds_cluster_parser.h | 57 + .../xds/grpc/xds_cluster_specifier_plugin.cc | 1 - .../src/core/xds/grpc/xds_common_types.cc | 470 +- .../grpc/src/core/xds/grpc/xds_common_types.h | 31 +- .../core/xds/grpc/xds_common_types_parser.cc | 467 ++ .../core/xds/grpc/xds_common_types_parser.h | 71 + deps/grpc/src/core/xds/grpc/xds_endpoint.cc | 419 -- deps/grpc/src/core/xds/grpc/xds_endpoint.h | 24 - .../src/core/xds/grpc/xds_endpoint_parser.cc | 439 ++ .../src/core/xds/grpc/xds_endpoint_parser.h | 48 + .../src/core/xds/grpc/xds_health_status.cc | 2 - .../src/core/xds/grpc/xds_health_status.h | 2 - .../core/xds/grpc/xds_http_fault_filter.cc | 28 +- .../src/core/xds/grpc/xds_http_fault_filter.h | 9 +- .../{xds_http_filters.h => xds_http_filter.h} | 81 +- ...filters.cc => xds_http_filter_registry.cc} | 11 +- .../core/xds/grpc/xds_http_filter_registry.h | 105 + .../xds/grpc/xds_http_gcp_authn_filter.cc | 142 + .../core/xds/grpc/xds_http_gcp_authn_filter.h | 61 + .../src/core/xds/grpc/xds_http_rbac_filter.cc | 26 +- .../src/core/xds/grpc/xds_http_rbac_filter.h | 9 +- .../grpc/xds_http_stateful_session_filter.cc | 20 +- .../grpc/xds_http_stateful_session_filter.h | 9 +- .../core/xds/grpc/xds_lb_policy_registry.cc | 39 +- deps/grpc/src/core/xds/grpc/xds_listener.cc | 1000 +-- deps/grpc/src/core/xds/grpc/xds_listener.h | 34 +- .../src/core/xds/grpc/xds_listener_parser.cc | 996 +++ .../src/core/xds/grpc/xds_listener_parser.h | 60 + deps/grpc/src/core/xds/grpc/xds_metadata.cc | 62 + deps/grpc/src/core/xds/grpc/xds_metadata.h | 127 + .../src/core/xds/grpc/xds_metadata_parser.cc | 143 + .../src/core/xds/grpc/xds_metadata_parser.h | 36 + .../src/core/xds/grpc/xds_route_config.cc | 915 --- .../grpc/src/core/xds/grpc/xds_route_config.h | 44 +- .../core/xds/grpc/xds_route_config_parser.cc | 964 +++ .../core/xds/grpc/xds_route_config_parser.h | 80 + deps/grpc/src/core/xds/grpc/xds_routing.cc | 81 +- deps/grpc/src/core/xds/grpc/xds_routing.h | 14 +- .../grpc/src/core/xds/grpc/xds_server_grpc.cc | 161 + deps/grpc/src/core/xds/grpc/xds_server_grpc.h | 63 + .../src/core/xds/grpc/xds_transport_grpc.cc | 10 +- deps/grpc/src/core/xds/xds_client/xds_api.cc | 20 +- .../src/core/xds/xds_client/xds_client.cc | 408 +- .../core/xds/xds_client/xds_client_stats.cc | 54 +- deps/grpc/src/cpp/client/channel_cc.cc | 1 - deps/grpc/src/cpp/client/client_context.cc | 1 - .../src/cpp/client/global_callback_hook.cc | 36 + deps/grpc/src/cpp/client/xds_credentials.cc | 1 - deps/grpc/src/cpp/common/alarm.cc | 1 - deps/grpc/src/cpp/common/channel_arguments.cc | 1 - .../cpp/common/tls_certificate_provider.cc | 1 - .../cpp/common/tls_certificate_verifier.cc | 1 - .../src/cpp/common/tls_credentials_options.cc | 1 - .../cpp/ext/filters/census/client_filter.cc | 36 +- .../cpp/ext/filters/census/client_filter.h | 2 + .../src/cpp/ext/filters/census/grpc_plugin.cc | 2 +- .../filters/census/open_census_call_tracer.h | 11 + .../ext/filters/census/server_call_tracer.cc | 40 +- .../src/cpp/ext/gcp/environment_autodetect.cc | 39 +- deps/grpc/src/cpp/ext/otel/BUILD | 1 + .../cpp/ext/otel/otel_client_call_tracer.cc | 31 +- .../cpp/ext/otel/otel_client_call_tracer.h | 12 +- deps/grpc/src/cpp/ext/otel/otel_plugin.cc | 187 +- deps/grpc/src/cpp/ext/otel/otel_plugin.h | 1 + .../cpp/ext/otel/otel_server_call_tracer.cc | 23 +- .../cpp/ext/otel/otel_server_call_tracer.h | 11 + .../src/cpp/ext/proto_server_reflection.cc | 4 +- .../cpp/ext/proto_server_reflection_plugin.cc | 32 +- .../src/cpp/server/backend_metric_recorder.cc | 210 +- .../cpp/server/insecure_server_credentials.cc | 1 - .../load_reporter_async_service_impl.h | 1 - deps/grpc/src/cpp/server/orca/orca_service.cc | 1 - deps/grpc/src/cpp/server/server_cc.cc | 2 +- .../src/cpp/server/xds_server_credentials.cc | 1 - deps/grpc/third_party/protobuf.patch | 2 +- deps/grpc/third_party/upb/upb/BUILD | 57 +- deps/grpc/third_party/upb/upb/base/BUILD | 2 +- .../third_party/upb/upb/base/string_view.h | 2 +- deps/grpc/third_party/upb/upb/bazel/BUILD | 31 + .../third_party/upb/upb/bazel/amalgamate.py | 136 + .../upb/upb/bazel/amalgamation.bzl | 67 + .../third_party/upb/upb/bazel/build_defs.bzl | 90 + .../third_party/upb/upb/cmake/BUILD.bazel | 2 +- .../cmake/google/protobuf/descriptor.upb.h | 558 +- .../protobuf/descriptor.upb_minitable.c | 170 +- .../protobuf/descriptor.upb_minitable.h | 1 + .../third_party/upb/upb/conformance/BUILD | 26 +- .../upb/upb/conformance/conformance_upb.c | 8 +- deps/grpc/third_party/upb/upb/hash/BUILD | 2 +- deps/grpc/third_party/upb/upb/json/BUILD | 9 +- deps/grpc/third_party/upb/upb/json/decode.c | 1 + deps/grpc/third_party/upb/upb/lex/BUILD | 2 +- deps/grpc/third_party/upb/upb/mem/BUILD | 4 +- deps/grpc/third_party/upb/upb/mem/arena.c | 69 +- deps/grpc/third_party/upb/upb/mem/arena.h | 20 +- .../third_party/upb/upb/mem/arena_test.cc | 48 +- .../third_party/upb/upb/mem/internal/arena.h | 19 +- deps/grpc/third_party/upb/upb/message/BUILD | 38 +- .../third_party/upb/upb/message/accessors.c | 11 +- .../third_party/upb/upb/message/accessors.h | 87 +- .../upb/upb/message/accessors_test.cc | 4 +- deps/grpc/third_party/upb/upb/message/array.c | 29 +- deps/grpc/third_party/upb/upb/message/array.h | 26 +- .../upb/upb/message/array_split64.h | 70 - .../third_party/upb/upb/message/compare.c | 242 +- .../third_party/upb/upb/message/compare.h | 57 +- .../grpc/third_party/upb/upb/message/compat.c | 10 +- .../grpc/third_party/upb/upb/message/compat.h | 6 +- deps/grpc/third_party/upb/upb/message/copy.c | 25 +- .../third_party/upb/upb/message/copy_test.cc | 3 +- .../upb/upb/message/internal/accessors.h | 80 +- .../upb/upb/message/internal/array.h | 38 +- .../internal/compare_unknown.c} | 12 +- .../internal/compare_unknown.h} | 19 +- .../internal/compare_unknown_test.cc} | 22 +- .../upb/upb/message/internal/extension.c | 23 +- .../upb/upb/message/internal/extension.h | 21 +- .../upb/upb/message/internal/map.h | 15 + .../upb/upb/message/internal/map_sorter.h | 9 +- .../upb/upb/message/internal/message.c | 23 +- .../upb/upb/message/internal/message.h | 10 + .../upb/upb/message/internal/tagged_ptr.h | 10 +- .../upb/upb/message/internal/types.h | 42 +- deps/grpc/third_party/upb/upb/message/map.c | 25 + deps/grpc/third_party/upb/upb/message/map.h | 18 +- .../third_party/upb/upb/message/message.c | 87 +- .../third_party/upb/upb/message/message.h | 21 +- .../third_party/upb/upb/message/promote.c | 9 +- .../third_party/upb/upb/message/promote.h | 2 +- .../upb/upb/message/promote_test.cc | 16 +- .../third_party/upb/upb/message/tagged_ptr.h | 12 +- deps/grpc/third_party/upb/upb/message/test.cc | 107 +- .../third_party/upb/upb/message/test.proto | 21 + .../third_party/upb/upb/mini_descriptor/BUILD | 2 +- .../upb/upb/mini_descriptor/build_enum.c | 6 +- .../upb/upb/mini_descriptor/build_enum.h | 20 +- .../upb/upb/mini_descriptor/decode.c | 13 +- .../upb/upb/mini_descriptor/link.c | 34 +- .../grpc/third_party/upb/upb/mini_table/BUILD | 4 +- .../third_party/upb/upb/mini_table/enum.h | 6 +- .../upb/upb/mini_table/extension.h | 16 +- .../third_party/upb/upb/mini_table/field.h | 50 +- .../third_party/upb/upb/mini_table/file.h | 25 +- .../upb/upb/mini_table/internal/enum.h | 2 +- .../upb/upb/mini_table/internal/extension.h | 18 +- .../upb/upb/mini_table/internal/field.h | 46 +- .../upb/upb/mini_table/internal/file.h | 14 +- .../upb/upb/mini_table/internal/message.h | 78 +- .../upb/upb/mini_table/internal/sub.h | 8 +- .../third_party/upb/upb/mini_table/message.h | 35 +- .../grpc/third_party/upb/upb/mini_table/sub.h | 16 +- deps/grpc/third_party/upb/upb/port/BUILD | 2 +- deps/grpc/third_party/upb/upb/port/def.inc | 18 +- deps/grpc/third_party/upb/upb/port/undef.inc | 2 +- .../grpc/third_party/upb/upb/reflection/BUILD | 50 +- .../cmake/google/protobuf/descriptor.upb.h | 6699 +++++++++++++++++ .../protobuf/descriptor.upb_minitable.c | 1364 ++++ .../protobuf/descriptor.upb_minitable.h | 79 + .../third_party/upb/upb/reflection/def.hpp | 27 + .../third_party/upb/upb/reflection/def_pool.h | 4 +- .../third_party/upb/upb/reflection/enum_def.c | 6 +- .../third_party/upb/upb/reflection/enum_def.h | 1 + .../upb/upb/reflection/enum_value_def.c | 11 +- .../upb/upb/reflection/field_def.c | 85 +- .../upb/upb/reflection/field_def.h | 3 + .../third_party/upb/upb/reflection/file_def.c | 34 +- .../third_party/upb/upb/reflection/file_def.h | 3 + .../internal/upb_edition_defaults.h | 2 +- .../third_party/upb/upb/reflection/message.c | 26 +- .../upb/upb/reflection/message_def.c | 23 +- .../upb/upb/reflection/method_def.h | 15 +- .../upb/upb/reflection/service_def.h | 11 +- .../stage0/google/protobuf/descriptor.upb.c | 26 +- .../stage0/google/protobuf/descriptor.upb.h | 493 +- deps/grpc/third_party/upb/upb/test/BUILD | 48 +- .../upb/upb/test/length_prefixed_test.cc | 86 + deps/grpc/third_party/upb/upb/text/BUILD | 2 +- deps/grpc/third_party/upb/upb/text/encode.c | 13 +- deps/grpc/third_party/upb/upb/util/BUILD | 70 +- .../third_party/upb/upb/util/def_to_proto.c | 19 +- .../upb/util/def_to_proto_editions_test.proto | 8 + .../upb/upb/util/def_to_proto_test.cc | 27 + deps/grpc/third_party/upb/upb/wire/BUILD | 4 +- deps/grpc/third_party/upb/upb/wire/decode.c | 148 +- deps/grpc/third_party/upb/upb/wire/decode.h | 12 +- deps/grpc/third_party/upb/upb/wire/encode.c | 78 +- deps/grpc/third_party/upb/upb/wire/encode.h | 10 +- .../upb/upb/wire/eps_copy_input_stream.h | 6 +- .../upb/upb/wire/internal/decode_fast.c | 54 +- .../upb/upb/wire/internal/reader.h | 6 +- deps/grpc/third_party/upb/upb/wire/reader.c | 3 +- deps/grpc/third_party/upb/upb/wire/reader.h | 12 +- 1182 files changed, 48271 insertions(+), 37149 deletions(-) create mode 100644 deps/grpc/include/grpcpp/generic/callback_generic_service.h create mode 100644 deps/grpc/include/grpcpp/generic/generic_stub_callback.h create mode 100644 deps/grpc/include/grpcpp/impl/generic_stub_internal.h create mode 100644 deps/grpc/include/grpcpp/support/global_callback_hook.h delete mode 100644 deps/grpc/src/compiler/.clang-format delete mode 100644 deps/grpc/src/compiler/BUILD delete mode 100644 deps/grpc/src/compiler/README.md delete mode 100644 deps/grpc/src/compiler/config.h delete mode 100644 deps/grpc/src/compiler/config_protobuf.h delete mode 100644 deps/grpc/src/compiler/cpp_generator.cc delete mode 100644 deps/grpc/src/compiler/cpp_generator.h delete mode 100644 deps/grpc/src/compiler/cpp_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/cpp_plugin.cc delete mode 100644 deps/grpc/src/compiler/cpp_plugin.h delete mode 100644 deps/grpc/src/compiler/csharp_generator.cc delete mode 100644 deps/grpc/src/compiler/csharp_generator.h delete mode 100644 deps/grpc/src/compiler/csharp_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/csharp_plugin.cc delete mode 100644 deps/grpc/src/compiler/generator_helpers.h delete mode 100644 deps/grpc/src/compiler/node_generator.cc delete mode 100644 deps/grpc/src/compiler/node_generator.h delete mode 100644 deps/grpc/src/compiler/node_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/node_plugin.cc delete mode 100644 deps/grpc/src/compiler/objective_c_generator.cc delete mode 100644 deps/grpc/src/compiler/objective_c_generator.h delete mode 100644 deps/grpc/src/compiler/objective_c_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/objective_c_plugin.cc delete mode 100644 deps/grpc/src/compiler/php_generator.cc delete mode 100644 deps/grpc/src/compiler/php_generator.h delete mode 100644 deps/grpc/src/compiler/php_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/php_plugin.cc delete mode 100644 deps/grpc/src/compiler/proto_parser_helper.cc delete mode 100644 deps/grpc/src/compiler/proto_parser_helper.h delete mode 100644 deps/grpc/src/compiler/protobuf_plugin.h delete mode 100644 deps/grpc/src/compiler/python_generator.cc delete mode 100644 deps/grpc/src/compiler/python_generator.h delete mode 100644 deps/grpc/src/compiler/python_generator_helpers.h delete mode 100644 deps/grpc/src/compiler/python_plugin.cc delete mode 100644 deps/grpc/src/compiler/python_private_generator.h delete mode 100644 deps/grpc/src/compiler/ruby_generator.cc delete mode 100644 deps/grpc/src/compiler/ruby_generator.h delete mode 100644 deps/grpc/src/compiler/ruby_generator_helpers-inl.h delete mode 100644 deps/grpc/src/compiler/ruby_generator_map-inl.h delete mode 100644 deps/grpc/src/compiler/ruby_generator_string-inl.h delete mode 100644 deps/grpc/src/compiler/ruby_plugin.cc delete mode 100644 deps/grpc/src/compiler/schema_interface.h delete mode 100644 deps/grpc/src/core/client_channel/config_selector.cc create mode 100644 deps/grpc/src/core/client_channel/direct_channel.cc create mode 100644 deps/grpc/src/core/client_channel/direct_channel.h create mode 100644 deps/grpc/src/core/client_channel/lb_metadata.cc create mode 100644 deps/grpc/src/core/client_channel/lb_metadata.h create mode 100644 deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc create mode 100644 deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h create mode 100644 deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc create mode 100644 deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h delete mode 100644 deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc delete mode 100644 deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h create mode 100644 deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h create mode 100644 deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c create mode 100644 deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h create mode 100644 deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c create mode 100644 deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h delete mode 100644 deps/grpc/src/core/lib/event_engine/trace.h create mode 100644 deps/grpc/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc create mode 100644 deps/grpc/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h create mode 100644 deps/grpc/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.cc create mode 100644 deps/grpc/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h delete mode 100644 deps/grpc/src/core/lib/surface/api_trace.h create mode 100644 deps/grpc/src/core/lib/transport/call_state.cc create mode 100644 deps/grpc/src/core/lib/transport/call_state.h create mode 100644 deps/grpc/src/core/resolver/xds/xds_config.cc create mode 100644 deps/grpc/src/core/resolver/xds/xds_config.h delete mode 100644 deps/grpc/src/core/util/android/log.cc create mode 100644 deps/grpc/src/core/util/latent_see.cc create mode 100644 deps/grpc/src/core/util/latent_see.h delete mode 100644 deps/grpc/src/core/util/linux/log.cc create mode 100644 deps/grpc/src/core/util/lru_cache.h delete mode 100644 deps/grpc/src/core/util/posix/log.cc create mode 100644 deps/grpc/src/core/util/ring_buffer.h create mode 100644 deps/grpc/src/core/util/unique_ptr_with_bitset.h rename deps/grpc/src/core/{xds/grpc => util}/upb_utils.h (87%) delete mode 100644 deps/grpc/src/core/util/windows/log.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_cluster_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_cluster_parser.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_common_types_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_common_types_parser.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_endpoint_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_endpoint_parser.h rename deps/grpc/src/core/xds/grpc/{xds_http_filters.h => xds_http_filter.h} (64%) rename deps/grpc/src/core/xds/grpc/{xds_http_filters.cc => xds_http_filter_registry.cc} (90%) create mode 100644 deps/grpc/src/core/xds/grpc/xds_http_filter_registry.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_http_gcp_authn_filter.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_http_gcp_authn_filter.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_listener_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_listener_parser.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_metadata.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_metadata.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_metadata_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_metadata_parser.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_route_config_parser.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_route_config_parser.h create mode 100644 deps/grpc/src/core/xds/grpc/xds_server_grpc.cc create mode 100644 deps/grpc/src/core/xds/grpc/xds_server_grpc.h create mode 100644 deps/grpc/src/cpp/client/global_callback_hook.cc create mode 100644 deps/grpc/third_party/upb/upb/bazel/BUILD create mode 100755 deps/grpc/third_party/upb/upb/bazel/amalgamate.py create mode 100644 deps/grpc/third_party/upb/upb/bazel/amalgamation.bzl create mode 100644 deps/grpc/third_party/upb/upb/bazel/build_defs.bzl delete mode 100644 deps/grpc/third_party/upb/upb/message/array_split64.h rename deps/grpc/third_party/upb/upb/{util/compare.c => message/internal/compare_unknown.c} (95%) rename deps/grpc/third_party/upb/upb/{util/compare.h => message/internal/compare_unknown.h} (70%) rename deps/grpc/third_party/upb/upb/{util/compare_test.cc => message/internal/compare_unknown_test.cc} (89%) create mode 100644 deps/grpc/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h create mode 100644 deps/grpc/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c create mode 100644 deps/grpc/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h create mode 100644 deps/grpc/third_party/upb/upb/test/length_prefixed_test.cc create mode 100644 deps/grpc/third_party/upb/upb/util/def_to_proto_editions_test.proto diff --git a/deps/grpc/.bazelversion b/deps/grpc/.bazelversion index a3fcc7121b..643916c03f 100644 --- a/deps/grpc/.bazelversion +++ b/deps/grpc/.bazelversion @@ -1 +1 @@ -7.1.0 +7.3.1 diff --git a/deps/grpc/.clang-tidy b/deps/grpc/.clang-tidy index 32eed8a70e..ee5d054602 100644 --- a/deps/grpc/.clang-tidy +++ b/deps/grpc/.clang-tidy @@ -69,11 +69,14 @@ Checks: '-*, bugprone-*, -bugprone-assignment-in-if-condition, -bugprone-branch-clone, + -bugprone-casting-through-void, -bugprone-easily-swappable-parameters, -bugprone-empty-catch, -bugprone-exception-escape, -bugprone-implicit-widening-of-multiplication-result, + -bugprone-inc-dec-in-conditions, -bugprone-infinite-loop, + -bugprone-multi-level-implicit-pointer-conversion, -bugprone-narrowing-conversions, -bugprone-not-null-terminated-result, -bugprone-reserved-identifier, @@ -82,18 +85,18 @@ Checks: '-*, -bugprone-switch-missing-default-case, -bugprone-too-small-loop-variable, -bugprone-unchecked-optional-access, + -bugprone-unused-local-non-trivial-variable, google-*, -google-readability-casting, -google-runtime-int, - -google-runtime-references, performance-*, -performance-avoid-endl, + -performance-enum-size, -performance-no-automatic-move, -performance-no-int-to-ptr, -performance-noexcept-swap, -performance-unnecessary-copy-initialization, -performance-unnecessary-value-param, - clang-diagnostic-deprecated-declarations, clang-diagnostic-deprecated-register, clang-diagnostic-expansion-to-defined, clang-diagnostic-ignored-attributes, @@ -102,6 +105,7 @@ Checks: '-*, clang-diagnostic-shift-sign-overflow, clang-diagnostic-tautological-undefined-compare, clang-diagnostic-thread-safety*, + -clang-diagnostic-thread-safety-reference-return, clang-diagnostic-undefined-bool-conversion, clang-diagnostic-unreachable-code, clang-diagnostic-unreachable-code-loop-increment, @@ -126,6 +130,7 @@ Checks: '-*, modernize-use-noexcept, modernize-use-nullptr, modernize-use-override, + modernize-use-starts-ends-with, modernize-use-transparent-functors, readability-braces-around-statements, readability-const-return-type, @@ -135,13 +140,13 @@ Checks: '-*, readability-duplicate-include, readability-function-size, readability-inconsistent-declaration-parameter-name, + readability-math-missing-parentheses, readability-misleading-indentation, readability-misplaced-array-index, readability-redundant-access-specifiers, readability-redundant-control-flow, readability-redundant-function-ptr-dereference, readability-redundant-smartptr-get, - -readability-redundant-string-cstr, readability-redundant-string-init, readability-simplify-boolean-expr, readability-static-definition-in-anonymous-namespace, @@ -149,13 +154,13 @@ Checks: '-*, readability-uniqueptr-delete-release' WarningsAsErrors: '*' CheckOptions: - - key: readability-function-size.StatementThreshold + - key: bugprone-unused-return-value.AllowCastToVoid + value: true + - key: readability-braces-around-statements.ShortStatementLines value: '450' + - key: readability-simplify-boolean-expr.SimplifyDeMorgan + value: false - key: modernize-make-unique.MakeSmartPtrFunction value: 'absl::make_unique' - key: modernize-make-unique.MakeSmartPtrFunctionHeader value: 'absl/memory/memory.h' - - key: readability-braces-around-statements.ShortStatementLines - value: 1 - - key: readability-simplify-boolean-expr.SimplifyDeMorgan - value: false diff --git a/deps/grpc/.gitignore b/deps/grpc/.gitignore index cce15572a7..ed5f4ce269 100644 --- a/deps/grpc/.gitignore +++ b/deps/grpc/.gitignore @@ -143,9 +143,6 @@ perf.data perf.data.old # bm_diff -bm_diff_new/ -bm_diff_old/ -bm_*.json bloat_diff_new/ bloat_diff_old/ bloaty-build/ diff --git a/deps/grpc/Makefile b/deps/grpc/Makefile index c509b19acb..74a6077593 100644 --- a/deps/grpc/Makefile +++ b/deps/grpc/Makefile @@ -367,8 +367,8 @@ E = @echo Q = @ endif -CORE_VERSION = 42.0.0 -CPP_VERSION = 1.65.2 +CORE_VERSION = 44.0.0 +CPP_VERSION = 1.67.1 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) @@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll SHARED_EXT_CPP = dll SHARED_PREFIX = -SHARED_VERSION_CORE = -42 +SHARED_VERSION_CORE = -44 SHARED_VERSION_CPP = -1 else ifeq ($(SYSTEM),Darwin) EXECUTABLE_SUFFIX = @@ -675,9 +675,10 @@ LIBGRPC_SRC = \ src/core/client_channel/client_channel_filter.cc \ src/core/client_channel/client_channel_plugin.cc \ src/core/client_channel/client_channel_service_config.cc \ - src/core/client_channel/config_selector.cc \ + src/core/client_channel/direct_channel.cc \ src/core/client_channel/dynamic_filters.cc \ src/core/client_channel/global_subchannel_pool.cc \ + src/core/client_channel/lb_metadata.cc \ src/core/client_channel/load_balanced_call_destination.cc \ src/core/client_channel/local_subchannel_pool.cc \ src/core/client_channel/retry_filter.cc \ @@ -693,6 +694,8 @@ LIBGRPC_SRC = \ src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \ src/core/ext/filters/fault_injection/fault_injection_filter.cc \ src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \ + src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc \ + src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc \ src/core/ext/filters/http/client/http_client_filter.cc \ src/core/ext/filters/http/client_authority_filter.cc \ src/core/ext/filters/http/http_filters_plugin.cc \ @@ -725,7 +728,6 @@ LIBGRPC_SRC = \ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ - src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \ src/core/ext/transport/chttp2/transport/parsing.cc \ src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc \ src/core/ext/transport/chttp2/transport/ping_callbacks.cc \ @@ -804,6 +806,7 @@ LIBGRPC_SRC = \ src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \ src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \ src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \ + src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c \ src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \ src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \ src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \ @@ -969,6 +972,7 @@ LIBGRPC_SRC = \ src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \ src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \ src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \ + src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c \ src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \ src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \ src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \ @@ -1276,6 +1280,7 @@ LIBGRPC_SRC = \ src/core/lib/security/credentials/external/file_external_account_credentials.cc \ src/core/lib/security/credentials/external/url_external_account_credentials.cc \ src/core/lib/security/credentials/fake/fake_credentials.cc \ + src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \ src/core/lib/security/credentials/google_default/credentials_generic.cc \ src/core/lib/security/credentials/google_default/google_default_credentials.cc \ src/core/lib/security/credentials/iam/iam_credentials.cc \ @@ -1295,6 +1300,7 @@ LIBGRPC_SRC = \ src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc \ src/core/lib/security/credentials/tls/tls_credentials.cc \ src/core/lib/security/credentials/tls/tls_utils.cc \ + src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.cc \ src/core/lib/security/credentials/xds/xds_credentials.cc \ src/core/lib/security/security_connector/alts/alts_security_connector.cc \ src/core/lib/security/security_connector/fake/fake_security_connector.cc \ @@ -1342,6 +1348,7 @@ LIBGRPC_SRC = \ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/call_spine.cc \ + src/core/lib/transport/call_state.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/interception_chain.cc \ @@ -1402,6 +1409,7 @@ LIBGRPC_SRC = \ src/core/resolver/resolver.cc \ src/core/resolver/resolver_registry.cc \ src/core/resolver/sockaddr/sockaddr_resolver.cc \ + src/core/resolver/xds/xds_config.cc \ src/core/resolver/xds/xds_dependency_manager.cc \ src/core/resolver/xds/xds_resolver.cc \ src/core/server/server.cc \ @@ -1447,7 +1455,6 @@ LIBGRPC_SRC = \ src/core/tsi/transport_security.cc \ src/core/tsi/transport_security_grpc.cc \ src/core/util/alloc.cc \ - src/core/util/android/log.cc \ src/core/util/atm.cc \ src/core/util/gcp_metadata_query.cc \ src/core/util/http_client/format_request.cc \ @@ -1459,12 +1466,11 @@ LIBGRPC_SRC = \ src/core/util/json/json_reader.cc \ src/core/util/json/json_util.cc \ src/core/util/json/json_writer.cc \ + src/core/util/latent_see.cc \ src/core/util/linux/cpu.cc \ - src/core/util/linux/log.cc \ src/core/util/log.cc \ src/core/util/msys/tmpfile.cc \ src/core/util/posix/cpu.cc \ - src/core/util/posix/log.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ src/core/util/posix/time.cc \ @@ -1475,7 +1481,6 @@ LIBGRPC_SRC = \ src/core/util/time.cc \ src/core/util/time_precise.cc \ src/core/util/windows/cpu.cc \ - src/core/util/windows/log.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ @@ -1488,18 +1493,27 @@ LIBGRPC_SRC = \ src/core/xds/grpc/xds_certificate_provider.cc \ src/core/xds/grpc/xds_client_grpc.cc \ src/core/xds/grpc/xds_cluster.cc \ + src/core/xds/grpc/xds_cluster_parser.cc \ src/core/xds/grpc/xds_cluster_specifier_plugin.cc \ src/core/xds/grpc/xds_common_types.cc \ + src/core/xds/grpc/xds_common_types_parser.cc \ src/core/xds/grpc/xds_endpoint.cc \ + src/core/xds/grpc/xds_endpoint_parser.cc \ src/core/xds/grpc/xds_health_status.cc \ src/core/xds/grpc/xds_http_fault_filter.cc \ - src/core/xds/grpc/xds_http_filters.cc \ + src/core/xds/grpc/xds_http_filter_registry.cc \ + src/core/xds/grpc/xds_http_gcp_authn_filter.cc \ src/core/xds/grpc/xds_http_rbac_filter.cc \ src/core/xds/grpc/xds_http_stateful_session_filter.cc \ src/core/xds/grpc/xds_lb_policy_registry.cc \ src/core/xds/grpc/xds_listener.cc \ + src/core/xds/grpc/xds_listener_parser.cc \ + src/core/xds/grpc/xds_metadata.cc \ + src/core/xds/grpc/xds_metadata_parser.cc \ src/core/xds/grpc/xds_route_config.cc \ + src/core/xds/grpc/xds_route_config_parser.cc \ src/core/xds/grpc/xds_routing.cc \ + src/core/xds/grpc/xds_server_grpc.cc \ src/core/xds/grpc/xds_transport_grpc.cc \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_bootstrap.cc \ @@ -1681,6 +1695,7 @@ LIBGRPC_SRC = \ third_party/upb/upb/message/array.c \ third_party/upb/upb/message/compat.c \ third_party/upb/upb/message/copy.c \ + third_party/upb/upb/message/internal/compare_unknown.c \ third_party/upb/upb/message/internal/extension.c \ third_party/upb/upb/message/internal/message.c \ third_party/upb/upb/message/map.c \ @@ -1833,8 +1848,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_ ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.42 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.42 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.44 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.44 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif endif @@ -1969,6 +1984,8 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c \ third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c \ third_party/boringssl-with-bazel/src/crypto/mem.c \ + third_party/boringssl-with-bazel/src/crypto/mldsa/mldsa.c \ + third_party/boringssl-with-bazel/src/crypto/mlkem/mlkem.cc \ third_party/boringssl-with-bazel/src/crypto/obj/obj.c \ third_party/boringssl-with-bazel/src/crypto/obj/obj_xref.c \ third_party/boringssl-with-bazel/src/crypto/pem/pem_all.c \ @@ -1989,12 +2006,14 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_vec.c \ third_party/boringssl-with-bazel/src/crypto/pool/pool.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/deterministic.c \ + third_party/boringssl-with-bazel/src/crypto/rand_extra/fork_detect.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/forkunsafe.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/getentropy.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/ios.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/passive.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/rand_extra.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/trusty.c \ + third_party/boringssl-with-bazel/src/crypto/rand_extra/urandom.c \ third_party/boringssl-with-bazel/src/crypto/rand_extra/windows.c \ third_party/boringssl-with-bazel/src/crypto/rc4/rc4.c \ third_party/boringssl-with-bazel/src/crypto/refcount.c \ diff --git a/deps/grpc/grpc.gyp b/deps/grpc/grpc.gyp index 667d6be30d..efcc883f0f 100644 --- a/deps/grpc/grpc.gyp +++ b/deps/grpc/grpc.gyp @@ -143,9 +143,10 @@ 'src/core/client_channel/client_channel_filter.cc', 'src/core/client_channel/client_channel_plugin.cc', 'src/core/client_channel/client_channel_service_config.cc', - 'src/core/client_channel/config_selector.cc', + 'src/core/client_channel/direct_channel.cc', 'src/core/client_channel/dynamic_filters.cc', 'src/core/client_channel/global_subchannel_pool.cc', + 'src/core/client_channel/lb_metadata.cc', 'src/core/client_channel/load_balanced_call_destination.cc', 'src/core/client_channel/local_subchannel_pool.cc', 'src/core/client_channel/retry_filter.cc', @@ -164,6 +165,8 @@ 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc', + 'src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc', + 'src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc', 'src/core/ext/filters/http/client_authority_filter.cc', 'src/core/ext/filters/http/http_filters_plugin.cc', 'src/core/ext/filters/logging/logging_filter.cc', @@ -224,7 +227,6 @@ 'src/core/ext/transport/chttp2/transport/hpack_parser_table.cc', 'src/core/ext/transport/chttp2/transport/http2_settings.cc', 'src/core/ext/transport/chttp2/transport/huffsyms.cc', - 'src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc', 'src/core/ext/transport/chttp2/transport/parsing.cc', 'src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc', 'src/core/ext/transport/chttp2/transport/ping_callbacks.cc', @@ -312,6 +314,7 @@ 'src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c', + 'src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c', @@ -471,6 +474,7 @@ 'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c', + 'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c', @@ -732,6 +736,7 @@ 'src/core/lib/transport/call_filters.cc', 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/call_spine.cc', + 'src/core/lib/transport/call_state.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/interception_chain.cc', @@ -830,6 +835,7 @@ 'src/core/lib/security/credentials/external/file_external_account_credentials.cc', 'src/core/lib/security/credentials/external/url_external_account_credentials.cc', 'src/core/lib/security/credentials/fake/fake_credentials.cc', + 'src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc', 'src/core/lib/security/credentials/google_default/credentials_generic.cc', 'src/core/lib/security/credentials/google_default/google_default_credentials.cc', 'src/core/lib/security/credentials/iam/iam_credentials.cc', @@ -849,6 +855,7 @@ 'src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc', 'src/core/lib/security/credentials/tls/tls_credentials.cc', 'src/core/lib/security/credentials/tls/tls_utils.cc', + 'src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.cc', 'src/core/lib/security/credentials/xds/xds_credentials.cc', 'src/core/lib/security/security_connector/alts/alts_security_connector.cc', 'src/core/lib/security/security_connector/fake/fake_security_connector.cc', @@ -894,6 +901,7 @@ 'src/core/resolver/fake/fake_resolver.cc', 'src/core/resolver/google_c2p/google_c2p_resolver.cc', 'src/core/resolver/sockaddr/sockaddr_resolver.cc', + 'src/core/resolver/xds/xds_config.cc', 'src/core/resolver/xds/xds_dependency_manager.cc', 'src/core/resolver/xds/xds_resolver.cc', 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc', @@ -958,7 +966,6 @@ 'src/core/util/sync_abseil.cc', 'src/core/util/time.cc', 'src/core/util/time_precise.cc', - 'src/core/util/android/log.cc', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/httpcli.cc', 'src/core/util/http_client/httpcli_security_connector.cc', @@ -969,16 +976,13 @@ 'src/core/util/json/json_util.cc', 'src/core/util/json/json_writer.cc', 'src/core/util/linux/cpu.cc', - 'src/core/util/linux/log.cc', 'src/core/util/msys/tmpfile.cc', 'src/core/util/posix/cpu.cc', - 'src/core/util/posix/log.cc', 'src/core/util/posix/string.cc', 'src/core/util/posix/sync.cc', 'src/core/util/posix/time.cc', 'src/core/util/posix/tmpfile.cc', 'src/core/util/windows/cpu.cc', - 'src/core/util/windows/log.cc', 'src/core/util/windows/string.cc', 'src/core/util/windows/string_util.cc', 'src/core/util/windows/sync.cc', @@ -991,18 +995,27 @@ 'src/core/xds/grpc/xds_certificate_provider.cc', 'src/core/xds/grpc/xds_client_grpc.cc', 'src/core/xds/grpc/xds_cluster.cc', + 'src/core/xds/grpc/xds_cluster_parser.cc', 'src/core/xds/grpc/xds_cluster_specifier_plugin.cc', 'src/core/xds/grpc/xds_common_types.cc', + 'src/core/xds/grpc/xds_common_types_parser.cc', 'src/core/xds/grpc/xds_endpoint.cc', + 'src/core/xds/grpc/xds_endpoint_parser.cc', 'src/core/xds/grpc/xds_health_status.cc', 'src/core/xds/grpc/xds_http_fault_filter.cc', - 'src/core/xds/grpc/xds_http_filters.cc', + 'src/core/xds/grpc/xds_http_filter_registry.cc', + 'src/core/xds/grpc/xds_http_gcp_authn_filter.cc', 'src/core/xds/grpc/xds_http_rbac_filter.cc', 'src/core/xds/grpc/xds_http_stateful_session_filter.cc', 'src/core/xds/grpc/xds_lb_policy_registry.cc', 'src/core/xds/grpc/xds_listener.cc', + 'src/core/xds/grpc/xds_listener_parser.cc', + 'src/core/xds/grpc/xds_metadata.cc', + 'src/core/xds/grpc/xds_metadata_parser.cc', 'src/core/xds/grpc/xds_route_config.cc', + 'src/core/xds/grpc/xds_route_config_parser.cc', 'src/core/xds/grpc/xds_routing.cc', + 'src/core/xds/grpc/xds_server_grpc.cc', 'src/core/xds/grpc/xds_transport_grpc.cc', 'src/core/xds/xds_client/xds_api.cc', 'src/core/xds/xds_client/xds_bootstrap.cc', @@ -1059,6 +1072,7 @@ 'src/cpp/client/create_channel_internal.cc', 'src/cpp/client/create_channel_posix.cc', 'src/cpp/client/cronet_credentials.cc', + 'src/cpp/client/global_callback_hook.cc', 'src/cpp/client/insecure_credentials.cc', 'src/cpp/client/secure_credentials.cc', 'src/cpp/client/xds_credentials.cc', @@ -1223,7 +1237,6 @@ 'third_party/upb/upb/reflection/oneof_def.c', 'third_party/upb/upb/reflection/service_def.c', 'third_party/upb/upb/text/encode.c', - 'third_party/upb/upb/util/compare.c', 'third_party/upb/upb/util/def_to_proto.c', 'third_party/upb/upb/util/required_fields.c', 'third_party/upb/upb/wire/decode.c', diff --git a/deps/grpc/include/grpc/credentials.h b/deps/grpc/include/grpc/credentials.h index c3a076991c..b5814b913c 100644 --- a/deps/grpc/include/grpc/credentials.h +++ b/deps/grpc/include/grpc/credentials.h @@ -103,7 +103,7 @@ GRPCAPI grpc_call_credentials* grpc_sts_credentials_create( /** Context that can be used by metadata credentials plugin in order to create auth related metadata. */ typedef struct { - /** The fully qualifed service url. */ + /** The fully qualified service url. */ const char* service_url; /** The method name of the RPC being called (not fully qualified). diff --git a/deps/grpc/include/grpc/event_engine/README.md b/deps/grpc/include/grpc/event_engine/README.md index b2d4fef83b..ca7e346dab 100644 --- a/deps/grpc/include/grpc/event_engine/README.md +++ b/deps/grpc/include/grpc/event_engine/README.md @@ -23,7 +23,7 @@ thresholds. To enable this feature, the memory allocation of read/write buffers within an EventEngine must be acquired in the form of Slices from SliceAllocators. This is covered more fully in the gRFC and code. -### Documentating expectations around callback execution +### Documenting expectations around callback execution Some callbacks may be expensive to run. EventEngines should decide on and document whether callback execution might block polling operations. This way, application developers can plan accordingly (e.g., run their expensive callbacks diff --git a/deps/grpc/include/grpc/event_engine/event_engine.h b/deps/grpc/include/grpc/event_engine/event_engine.h index add6593aa7..21a0c1c482 100644 --- a/deps/grpc/include/grpc/event_engine/event_engine.h +++ b/deps/grpc/include/grpc/event_engine/event_engine.h @@ -503,6 +503,20 @@ bool operator!=(const EventEngine::ConnectionHandle& lhs, std::ostream& operator<<(std::ostream& out, const EventEngine::ConnectionHandle& handle); +namespace detail { +std::string FormatHandleString(uint64_t key1, uint64_t key2); +} + +template +void AbslStringify(Sink& out, const EventEngine::ConnectionHandle& handle) { + out.Append(detail::FormatHandleString(handle.keys[0], handle.keys[1])); +} + +template +void AbslStringify(Sink& out, const EventEngine::TaskHandle& handle) { + out.Append(detail::FormatHandleString(handle.keys[0], handle.keys[1])); +} + } // namespace experimental } // namespace grpc_event_engine diff --git a/deps/grpc/include/grpc/event_engine/extensible.h b/deps/grpc/include/grpc/event_engine/extensible.h index 51812f935c..9af4f37682 100644 --- a/deps/grpc/include/grpc/event_engine/extensible.h +++ b/deps/grpc/include/grpc/event_engine/extensible.h @@ -60,6 +60,9 @@ class Extensible { /// if (endpoint != nullptr) endpoint->Process(); /// virtual void* QueryExtension(absl::string_view /*id*/) { return nullptr; } + + protected: + ~Extensible() = default; }; } // namespace experimental diff --git a/deps/grpc/include/grpc/event_engine/internal/slice_cast.h b/deps/grpc/include/grpc/event_engine/internal/slice_cast.h index 3f9593464c..b6f3ae6277 100644 --- a/deps/grpc/include/grpc/event_engine/internal/slice_cast.h +++ b/deps/grpc/include/grpc/event_engine/internal/slice_cast.h @@ -24,7 +24,7 @@ namespace internal { // with `SliceCast`. Both ways need to be declared (i.e. if // SliceCastable exists, you should declare // SliceCastable too). -// The type has no members, it's just the existance of the specialization that +// The type has no members, it's just the existence of the specialization that // unlocks SliceCast usage for a type pair. template struct SliceCastable; diff --git a/deps/grpc/include/grpc/event_engine/memory_request.h b/deps/grpc/include/grpc/event_engine/memory_request.h index 2018b3d476..2ea7bc5c1a 100644 --- a/deps/grpc/include/grpc/event_engine/memory_request.h +++ b/deps/grpc/include/grpc/event_engine/memory_request.h @@ -46,6 +46,24 @@ class MemoryRequest { size_t min() const { return min_; } size_t max() const { return max_; } + bool operator==(const MemoryRequest& other) const { + return min_ == other.min_ && max_ == other.max_; + } + bool operator!=(const MemoryRequest& other) const { + return !(*this == other); + } + + template + friend void AbslStringify(Sink& s, const MemoryRequest& r) { + if (r.min_ == r.max_) { + s.Append(r.min_); + } else { + s.Append(r.min_); + s.Append(".."); + s.Append(r.max_); + } + } + private: size_t min_; size_t max_; diff --git a/deps/grpc/include/grpc/event_engine/slice.h b/deps/grpc/include/grpc/event_engine/slice.h index 8153f983a4..f4009648dc 100644 --- a/deps/grpc/include/grpc/event_engine/slice.h +++ b/deps/grpc/include/grpc/event_engine/slice.h @@ -25,7 +25,6 @@ #include #include -#include #include // This public slice definition largely based of the internal grpc_core::Slice diff --git a/deps/grpc/include/grpc/event_engine/slice_buffer.h b/deps/grpc/include/grpc/event_engine/slice_buffer.h index 0009089a6b..724c3d0729 100644 --- a/deps/grpc/include/grpc/event_engine/slice_buffer.h +++ b/deps/grpc/include/grpc/event_engine/slice_buffer.h @@ -28,7 +28,6 @@ #include #include #include -#include #include namespace grpc_event_engine { diff --git a/deps/grpc/include/grpc/grpc_crl_provider.h b/deps/grpc/include/grpc/grpc_crl_provider.h index 35d6df6f93..968d10b060 100644 --- a/deps/grpc/include/grpc/grpc_crl_provider.h +++ b/deps/grpc/include/grpc/grpc_crl_provider.h @@ -82,7 +82,7 @@ absl::StatusOr> CreateDirectoryReloaderCrlProvider( } // namespace experimental } // namespace grpc_core -// TODO(gtcooke94) - Mark with api macro when all wrapped langauges support C++ +// TODO(gtcooke94) - Mark with api macro when all wrapped languages support C++ // in core APIs /** * EXPERIMENTAL API - Subject to change diff --git a/deps/grpc/include/grpc/impl/channel_arg_names.h b/deps/grpc/include/grpc/impl/channel_arg_names.h index c47d928d5c..aa973c2197 100644 --- a/deps/grpc/include/grpc/impl/channel_arg_names.h +++ b/deps/grpc/include/grpc/impl/channel_arg_names.h @@ -259,7 +259,7 @@ issued by the tcp_write(). By default, this is set to 4. */ #define GRPC_ARG_TCP_TX_ZEROCOPY_MAX_SIMULT_SENDS \ "grpc.experimental.tcp_tx_zerocopy_max_simultaneous_sends" -/* Overrides the TCP socket recieve buffer size, SO_RCVBUF. */ +/* Overrides the TCP socket receive buffer size, SO_RCVBUF. */ #define GRPC_ARG_TCP_RECEIVE_BUFFER_SIZE "grpc.tcp_receive_buffer_size" /* Timeout in milliseconds to use for calls to the grpclb load balancer. If 0 or unset, the balancer calls will have no deadline. */ diff --git a/deps/grpc/include/grpc/support/log.h b/deps/grpc/include/grpc/support/log.h index 30117dd534..92a41f0066 100644 --- a/deps/grpc/include/grpc/support/log.h +++ b/deps/grpc/include/grpc/support/log.h @@ -28,73 +28,57 @@ extern "C" { #endif -/** - * Logging functions in this file are deprecated. - * Please use absl ABSL_LOG instead. - */ - /** The severity of a log message - use the #defines below when calling into - gpr_log to additionally supply file and line data */ + grpc_absl_log to additionally supply file and line data */ typedef enum gpr_log_severity { GPR_LOG_SEVERITY_DEBUG, GPR_LOG_SEVERITY_INFO, GPR_LOG_SEVERITY_ERROR } gpr_log_severity; -/** Returns a string representation of the log severity */ -GPRAPI const char* gpr_log_severity_string(gpr_log_severity severity); - /** Macros to build log contexts at various severity levels */ #define GPR_DEBUG __FILE__, __LINE__, GPR_LOG_SEVERITY_DEBUG #define GPR_INFO __FILE__, __LINE__, GPR_LOG_SEVERITY_INFO #define GPR_ERROR __FILE__, __LINE__, GPR_LOG_SEVERITY_ERROR -/** Log a message. It's advised to use GPR_xxx above to generate the context - * for each message */ -GPRAPI void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) GPR_PRINT_FORMAT_CHECK(4, 5); - -GPRAPI int gpr_should_log(gpr_log_severity severity); +/** + * EXPERIMENTAL. API stability not guaranteed. + * Should only be used from gRPC PHP and RUBY. + * This will be removed once Ruby and PHP can start using C++ APIs. + * We would replace this with calls to absl LOG functions. + * grpc_absl_log is equivalent to + * ABSL_LOG(severity) << message_str; + * **/ +GPRAPI void grpc_absl_log(const char* file, int line, gpr_log_severity severity, + const char* message_str); -GPRAPI void gpr_log_message(const char* file, int line, - gpr_log_severity severity, const char* message); +/** + * EXPERIMENTAL. API stability not guaranteed. + * Should only be used from gRPC PHP and RUBY. + * This will be removed once Ruby and PHP can start using C++ APIs. + * We would replace this with calls to absl LOG functions. + * grpc_absl_log_int is equivalent to + * ABSL_LOG(severity) << message_str << num; + * **/ +GPRAPI void grpc_absl_log_int(const char* file, int line, + gpr_log_severity severity, + const char* message_str, intptr_t num); -/** Set global log verbosity */ -GPRAPI void gpr_set_log_verbosity(gpr_log_severity deprecated_setting); +/** + * EXPERIMENTAL. API stability not guaranteed. + * Should only be used from gRPC PHP and RUBY. + * This will be removed once Ruby and PHP can start using C++ APIs. + * We would replace this with calls to absl LOG functions. + * grpc_absl_log_str is equivalent to + * ABSL_LOG(severity) << message_str1 << message_str2; + * **/ +GPRAPI void grpc_absl_log_str(const char* file, int line, + gpr_log_severity severity, + const char* message_str1, + const char* message_str2); GPRAPI void gpr_log_verbosity_init(void); -/** Log overrides: applications can use this API to intercept logging calls - and use their own implementations */ - -struct gpr_log_func_args { - const char* file; - int line; - gpr_log_severity severity; - const char* message; -}; - -typedef struct gpr_log_func_args gpr_log_func_args; - -typedef void (*gpr_log_func)(gpr_log_func_args* args); - -GPRAPI void gpr_set_log_function(gpr_log_func deprecated_setting); - -GPRAPI void gpr_assertion_failed(const char* filename, int line, - const char* message) GPR_ATTRIBUTE_NORETURN; - -/** abort() the process if x is zero, having written a line to the log. - - Intended for internal invariants. If the error can be recovered from, - without the possibility of corruption, or might best be reflected via - an exception in a higher-level language, consider returning error code. */ -#define GPR_ASSERT(x) \ - do { \ - if (GPR_UNLIKELY(!(x))) { \ - gpr_assertion_failed(__FILE__, __LINE__, #x); \ - } \ - } while (0) - #ifdef __cplusplus } #endif diff --git a/deps/grpc/include/grpc/support/metrics.h b/deps/grpc/include/grpc/support/metrics.h index 7462e6aba6..829db0a404 100644 --- a/deps/grpc/include/grpc/support/metrics.h +++ b/deps/grpc/include/grpc/support/metrics.h @@ -17,6 +17,7 @@ #include "absl/strings/string_view.h" +#include #include namespace grpc_core { @@ -26,9 +27,10 @@ namespace experimental { // plugins. class StatsPluginChannelScope { public: - StatsPluginChannelScope(absl::string_view target, - absl::string_view default_authority) - : target_(target), default_authority_(default_authority) {} + StatsPluginChannelScope( + absl::string_view target, absl::string_view default_authority, + const grpc_event_engine::experimental::EndpointConfig& args) + : target_(target), default_authority_(default_authority), args_(args) {} /// Returns the target used for creating the channel in the canonical form. /// (Canonicalized target definition - @@ -36,13 +38,22 @@ class StatsPluginChannelScope { absl::string_view target() const { return target_; } /// Returns the default authority for the channel. absl::string_view default_authority() const { return default_authority_; } + /// Returns channel arguments. THIS METHOD IS EXPERIMENTAL. + // TODO(roth, ctiller, yashkt): Find a better representation for + // channel args before de-experimentalizing this API. + const grpc_event_engine::experimental::EndpointConfig& experimental_args() + const { + return args_; + } private: // Disable copy constructor and copy-assignment operator. StatsPluginChannelScope(const StatsPluginChannelScope&) = delete; StatsPluginChannelScope& operator=(const StatsPluginChannelScope&) = delete; + absl::string_view target_; absl::string_view default_authority_; + const grpc_event_engine::experimental::EndpointConfig& args_; }; } // namespace experimental diff --git a/deps/grpc/include/grpc/support/port_platform.h b/deps/grpc/include/grpc/support/port_platform.h index e261bb1242..5fb7426af2 100644 --- a/deps/grpc/include/grpc/support/port_platform.h +++ b/deps/grpc/include/grpc/support/port_platform.h @@ -746,6 +746,22 @@ extern void gpr_unreachable_code(const char* reason, const char* file, #endif #endif /* GPR_ATTRIBUTE_NOINLINE */ +#ifndef GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#ifdef __cplusplus +#if GPR_HAS_CPP_ATTRIBUTE(clang::always_inline) +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION [[clang::always_inline]] +#elif GPR_HAS_ATTRIBUTE(always_inline) +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION __attribute__((always_inline)) +#else +// TODO(ctiller): add __forceinline for MSVC +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#endif +#else +// Disable for C code +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#endif +#endif /* GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION */ + #ifndef GPR_NO_UNIQUE_ADDRESS #if GPR_HAS_CPP_ATTRIBUTE(no_unique_address) #define GPR_NO_UNIQUE_ADDRESS [[no_unique_address]] @@ -820,6 +836,12 @@ extern void gpr_unreachable_code(const char* reason, const char* file, #endif /* __GPR_WINDOWS */ #endif /* GRPC_ALLOW_EXCEPTIONS */ +#ifdef __has_builtin +#define GRPC_HAS_BUILTIN(a) __has_builtin(a) +#else +#define GRPC_HAS_BUILTIN(a) 0 +#endif + /* Use GPR_LIKELY only in cases where you are sure that a certain outcome is the * most likely. Ideally, also collect performance numbers to justify the claim. */ diff --git a/deps/grpc/include/grpc/support/sync_generic.h b/deps/grpc/include/grpc/support/sync_generic.h index b3e638ce54..aa0261c2b6 100644 --- a/deps/grpc/include/grpc/support/sync_generic.h +++ b/deps/grpc/include/grpc/support/sync_generic.h @@ -29,8 +29,7 @@ typedef struct { gpr_atm state; } gpr_event; -#define GPR_EVENT_INIT \ - { 0 } +#define GPR_EVENT_INIT {0} /* gpr_refcount */ typedef struct { @@ -42,7 +41,6 @@ typedef struct { gpr_atm value; } gpr_stats_counter; -#define GPR_STATS_INIT \ - { 0 } +#define GPR_STATS_INIT {0} #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */ diff --git a/deps/grpc/include/grpcpp/client_context.h b/deps/grpc/include/grpcpp/client_context.h index d0934dd0f5..af3b533ed1 100644 --- a/deps/grpc/include/grpcpp/client_context.h +++ b/deps/grpc/include/grpcpp/client_context.h @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/completion_queue.h b/deps/grpc/include/grpcpp/completion_queue.h index 63d202b0e2..2bb391fccf 100644 --- a/deps/grpc/include/grpcpp/completion_queue.h +++ b/deps/grpc/include/grpcpp/completion_queue.h @@ -38,7 +38,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/ext/call_metric_recorder.h b/deps/grpc/include/grpcpp/ext/call_metric_recorder.h index 378a4594af..303a35db14 100644 --- a/deps/grpc/include/grpcpp/ext/call_metric_recorder.h +++ b/deps/grpc/include/grpcpp/ext/call_metric_recorder.h @@ -33,7 +33,7 @@ namespace experimental { /// Records call metrics for the purpose of load balancing. /// During an RPC, call \a ServerContext::ExperimentalGetCallMetricRecorder() -/// method to retrive the recorder for the current call. +/// method to retrieve the recorder for the current call. class CallMetricRecorder { public: virtual ~CallMetricRecorder() = default; diff --git a/deps/grpc/include/grpcpp/generic/async_generic_service.h b/deps/grpc/include/grpcpp/generic/async_generic_service.h index 77525d13b2..68013caf22 100644 --- a/deps/grpc/include/grpcpp/generic/async_generic_service.h +++ b/deps/grpc/include/grpcpp/generic/async_generic_service.h @@ -20,10 +20,9 @@ #define GRPCPP_GENERIC_ASYNC_GENERIC_SERVICE_H #include -#include +#include #include #include -#include struct grpc_server; @@ -78,57 +77,6 @@ class AsyncGenericService final { grpc::Server* server_; }; -/// \a ServerGenericBidiReactor is the reactor class for bidi streaming RPCs -/// invoked on a CallbackGenericService. It is just a ServerBidi reactor with -/// ByteBuffer arguments. -using ServerGenericBidiReactor = ServerBidiReactor; - -class GenericCallbackServerContext final : public grpc::CallbackServerContext { - public: - const std::string& method() const { return method_; } - const std::string& host() const { return host_; } - - private: - friend class grpc::Server; - - std::string method_; - std::string host_; -}; - -/// \a CallbackGenericService is the base class for generic services implemented -/// using the callback API and registered through the ServerBuilder using -/// RegisterCallbackGenericService. -class CallbackGenericService { - public: - CallbackGenericService() {} - virtual ~CallbackGenericService() {} - - /// The "method handler" for the generic API. This function should be - /// overridden to provide a ServerGenericBidiReactor that implements the - /// application-level interface for this RPC. Unimplemented by default. - virtual ServerGenericBidiReactor* CreateReactor( - GenericCallbackServerContext* /*ctx*/) { - class Reactor : public ServerGenericBidiReactor { - public: - Reactor() { this->Finish(Status(StatusCode::UNIMPLEMENTED, "")); } - void OnDone() override { delete this; } - }; - return new Reactor; - } - - private: - friend class grpc::Server; - - internal::CallbackBidiHandler* Handler() { - return new internal::CallbackBidiHandler( - [this](grpc::CallbackServerContext* ctx) { - return CreateReactor(static_cast(ctx)); - }); - } - - grpc::Server* server_{nullptr}; -}; - } // namespace grpc #endif // GRPCPP_GENERIC_ASYNC_GENERIC_SERVICE_H diff --git a/deps/grpc/include/grpcpp/generic/callback_generic_service.h b/deps/grpc/include/grpcpp/generic/callback_generic_service.h new file mode 100644 index 0000000000..db080a79e7 --- /dev/null +++ b/deps/grpc/include/grpcpp/generic/callback_generic_service.h @@ -0,0 +1,84 @@ +// +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +#ifndef GRPCPP_GENERIC_CALLBACK_GENERIC_SERVICE_H +#define GRPCPP_GENERIC_CALLBACK_GENERIC_SERVICE_H + +#include +#include +#include +#include + +struct grpc_server; + +namespace grpc { + +/// \a ServerGenericBidiReactor is the reactor class for bidi streaming RPCs +/// invoked on a CallbackGenericService. It is just a ServerBidi reactor with +/// ByteBuffer arguments. +using ServerGenericBidiReactor = ServerBidiReactor; + +class GenericCallbackServerContext final : public grpc::CallbackServerContext { + public: + const std::string& method() const { return method_; } + const std::string& host() const { return host_; } + + private: + friend class grpc::Server; + + std::string method_; + std::string host_; +}; + +/// \a CallbackGenericService is the base class for generic services implemented +/// using the callback API and registered through the ServerBuilder using +/// RegisterCallbackGenericService. +class CallbackGenericService { + public: + CallbackGenericService() {} + virtual ~CallbackGenericService() {} + + /// The "method handler" for the generic API. This function should be + /// overridden to provide a ServerGenericBidiReactor that implements the + /// application-level interface for this RPC. Unimplemented by default. + virtual ServerGenericBidiReactor* CreateReactor( + GenericCallbackServerContext* /*ctx*/) { + class Reactor : public ServerGenericBidiReactor { + public: + Reactor() { this->Finish(Status(StatusCode::UNIMPLEMENTED, "")); } + void OnDone() override { delete this; } + }; + return new Reactor; + } + + private: + friend class grpc::Server; + + internal::CallbackBidiHandler* Handler() { + return new internal::CallbackBidiHandler( + [this](grpc::CallbackServerContext* ctx) { + return CreateReactor(static_cast(ctx)); + }); + } + + grpc::Server* server_{nullptr}; +}; + +} // namespace grpc + +#endif // GRPCPP_GENERIC_CALLBACK_GENERIC_SERVICE_H diff --git a/deps/grpc/include/grpcpp/generic/generic_stub.h b/deps/grpc/include/grpcpp/generic/generic_stub.h index a44232bc51..bc06c602d7 100644 --- a/deps/grpc/include/grpcpp/generic/generic_stub.h +++ b/deps/grpc/include/grpcpp/generic/generic_stub.h @@ -19,15 +19,12 @@ #ifndef GRPCPP_GENERIC_GENERIC_STUB_H #define GRPCPP_GENERIC_GENERIC_STUB_H -#include - #include +#include #include #include #include #include -#include -#include #include namespace grpc { @@ -42,10 +39,12 @@ typedef ClientAsyncResponseReader GenericClientAsyncResponseReader; /// by name. In practice, the Request and Response types should be basic /// types like grpc::ByteBuffer or proto::MessageLite (the base protobuf). template -class TemplatedGenericStub final { +class TemplatedGenericStub final + : public internal::TemplatedGenericStubCallbackInternal { public: - explicit TemplatedGenericStub(std::shared_ptr channel) - : channel_(channel) {} + using internal::TemplatedGenericStubCallbackInternal< + RequestType, ResponseType>::TemplatedGenericStubCallbackInternal; /// Setup a call to a named method \a method using \a context, but don't /// start it. Let it be started explicitly with StartCall and a tag. @@ -74,6 +73,9 @@ class TemplatedGenericStub final { context, request)); } + using internal::TemplatedGenericStubCallbackInternal< + RequestType, ResponseType>::PrepareUnaryCall; + /// DEPRECATED for multi-threaded use /// Begin a call to a named method \a method using \a context. /// A tag \a tag will be delivered to \a cq when the call has been started @@ -87,72 +89,9 @@ class TemplatedGenericStub final { true, tag); } - /// Setup and start a unary call to a named method \a method using - /// \a context and specifying the \a request and \a response buffers. - void UnaryCall(ClientContext* context, const std::string& method, - StubOptions options, const RequestType* request, - ResponseType* response, - std::function on_completion) { - UnaryCallInternal(context, method, options, request, response, - std::move(on_completion)); - } - - /// Setup a unary call to a named method \a method using - /// \a context and specifying the \a request and \a response buffers. - /// Like any other reactor-based RPC, it will not be activated until - /// StartCall is invoked on its reactor. - void PrepareUnaryCall(ClientContext* context, const std::string& method, - StubOptions options, const RequestType* request, - ResponseType* response, ClientUnaryReactor* reactor) { - PrepareUnaryCallInternal(context, method, options, request, response, - reactor); - } - - /// Setup a call to a named method \a method using \a context and tied to - /// \a reactor . Like any other bidi streaming RPC, it will not be activated - /// until StartCall is invoked on its reactor. - void PrepareBidiStreamingCall( - ClientContext* context, const std::string& method, StubOptions options, - ClientBidiReactor* reactor) { - PrepareBidiStreamingCallInternal(context, method, options, reactor); - } - private: - std::shared_ptr channel_; - - void UnaryCallInternal(ClientContext* context, const std::string& method, - StubOptions options, const RequestType* request, - ResponseType* response, - std::function on_completion) { - internal::CallbackUnaryCall( - channel_.get(), - grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(), - grpc::internal::RpcMethod::NORMAL_RPC), - context, request, response, std::move(on_completion)); - } - - void PrepareUnaryCallInternal(ClientContext* context, - const std::string& method, StubOptions options, - const RequestType* request, - ResponseType* response, - ClientUnaryReactor* reactor) { - internal::ClientCallbackUnaryFactory::Create( - channel_.get(), - grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(), - grpc::internal::RpcMethod::NORMAL_RPC), - context, request, response, reactor); - } - - void PrepareBidiStreamingCallInternal( - ClientContext* context, const std::string& method, StubOptions options, - ClientBidiReactor* reactor) { - internal::ClientCallbackReaderWriterFactory:: - Create(channel_.get(), - grpc::internal::RpcMethod( - method.c_str(), options.suffix_for_stats(), - grpc::internal::RpcMethod::BIDI_STREAMING), - context, reactor); - } + using internal::TemplatedGenericStubCallbackInternal::channel_; std::unique_ptr> CallInternal(grpc::ChannelInterface* channel, ClientContext* context, diff --git a/deps/grpc/include/grpcpp/generic/generic_stub_callback.h b/deps/grpc/include/grpcpp/generic/generic_stub_callback.h new file mode 100644 index 0000000000..c039e2a443 --- /dev/null +++ b/deps/grpc/include/grpcpp/generic/generic_stub_callback.h @@ -0,0 +1,44 @@ +// +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +#ifndef GRPCPP_GENERIC_GENERIC_STUB_CALLBACK_H +#define GRPCPP_GENERIC_GENERIC_STUB_CALLBACK_H + +#include +#include + +namespace grpc { + +/// Generic stubs provide a type-unaware interface to call gRPC methods +/// by name. In practice, the Request and Response types should be basic +/// types like grpc::ByteBuffer or proto::MessageLite (the base protobuf). +template +class TemplatedGenericStubCallback final + : public internal::TemplatedGenericStubCallbackInternal { + public: + using internal::TemplatedGenericStubCallbackInternal< + RequestType, ResponseType>::TemplatedGenericStubCallbackInternal; +}; + +typedef TemplatedGenericStubCallback + GenericStubCallback; + +} // namespace grpc + +#endif // GRPCPP_GENERIC_GENERIC_STUB_CALLBACK_H diff --git a/deps/grpc/include/grpcpp/impl/codegen/config_protobuf.h b/deps/grpc/include/grpcpp/impl/codegen/config_protobuf.h index 06561cf121..b4095ff08f 100644 --- a/deps/grpc/include/grpcpp/impl/codegen/config_protobuf.h +++ b/deps/grpc/include/grpcpp/impl/codegen/config_protobuf.h @@ -71,6 +71,7 @@ #define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM \ ::google::protobuf::io::ZeroCopyInputStream #define GRPC_CUSTOM_CODEDINPUTSTREAM ::google::protobuf::io::CodedInputStream +#define GRPC_CUSTOM_CODEDOUTPUTSTREAM ::google::protobuf::io::CodedOutputStream #endif #ifndef GRPC_CUSTOM_JSONUTIL @@ -113,6 +114,7 @@ namespace io { typedef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ZeroCopyOutputStream; typedef GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ZeroCopyInputStream; typedef GRPC_CUSTOM_CODEDINPUTSTREAM CodedInputStream; +typedef GRPC_CUSTOM_CODEDOUTPUTSTREAM CodedOutputStream; } // namespace io } // namespace protobuf diff --git a/deps/grpc/include/grpcpp/impl/generic_stub_internal.h b/deps/grpc/include/grpcpp/impl/generic_stub_internal.h new file mode 100644 index 0000000000..ba8c929d8f --- /dev/null +++ b/deps/grpc/include/grpcpp/impl/generic_stub_internal.h @@ -0,0 +1,125 @@ +// +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +#ifndef GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H +#define GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H + +#include + +#include +#include +#include +#include +#include +#include + +namespace grpc { + +template +class TemplatedGenericStub; +template +class TemplatedGenericStubCallback; + +namespace internal { + +/// Generic stubs provide a type-unaware interface to call gRPC methods +/// by name. In practice, the Request and Response types should be basic +/// types like grpc::ByteBuffer or proto::MessageLite (the base protobuf). +template +class TemplatedGenericStubCallbackInternal { + public: + explicit TemplatedGenericStubCallbackInternal( + std::shared_ptr channel) + : channel_(channel) {} + + /// Setup and start a unary call to a named method \a method using + /// \a context and specifying the \a request and \a response buffers. + void UnaryCall(ClientContext* context, const std::string& method, + StubOptions options, const RequestType* request, + ResponseType* response, + std::function on_completion) { + UnaryCallInternal(context, method, options, request, response, + std::move(on_completion)); + } + + /// Setup a unary call to a named method \a method using + /// \a context and specifying the \a request and \a response buffers. + /// Like any other reactor-based RPC, it will not be activated until + /// StartCall is invoked on its reactor. + void PrepareUnaryCall(ClientContext* context, const std::string& method, + StubOptions options, const RequestType* request, + ResponseType* response, ClientUnaryReactor* reactor) { + PrepareUnaryCallInternal(context, method, options, request, response, + reactor); + } + + /// Setup a call to a named method \a method using \a context and tied to + /// \a reactor . Like any other bidi streaming RPC, it will not be activated + /// until StartCall is invoked on its reactor. + void PrepareBidiStreamingCall( + ClientContext* context, const std::string& method, StubOptions options, + ClientBidiReactor* reactor) { + PrepareBidiStreamingCallInternal(context, method, options, reactor); + } + + private: + template + friend class grpc::TemplatedGenericStub; + template + friend class grpc::TemplatedGenericStubCallback; + std::shared_ptr channel_; + + void UnaryCallInternal(ClientContext* context, const std::string& method, + StubOptions options, const RequestType* request, + ResponseType* response, + std::function on_completion) { + internal::CallbackUnaryCall( + channel_.get(), + grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(), + grpc::internal::RpcMethod::NORMAL_RPC), + context, request, response, std::move(on_completion)); + } + + void PrepareUnaryCallInternal(ClientContext* context, + const std::string& method, StubOptions options, + const RequestType* request, + ResponseType* response, + ClientUnaryReactor* reactor) { + internal::ClientCallbackUnaryFactory::Create( + channel_.get(), + grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(), + grpc::internal::RpcMethod::NORMAL_RPC), + context, request, response, reactor); + } + + void PrepareBidiStreamingCallInternal( + ClientContext* context, const std::string& method, StubOptions options, + ClientBidiReactor* reactor) { + internal::ClientCallbackReaderWriterFactory:: + Create(channel_.get(), + grpc::internal::RpcMethod( + method.c_str(), options.suffix_for_stats(), + grpc::internal::RpcMethod::BIDI_STREAMING), + context, reactor); + } +}; + +} // namespace internal +} // namespace grpc + +#endif // GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H diff --git a/deps/grpc/include/grpcpp/impl/interceptor_common.h b/deps/grpc/include/grpcpp/impl/interceptor_common.h index 7e3a566f6b..2d4c56701d 100644 --- a/deps/grpc/include/grpcpp/impl/interceptor_common.h +++ b/deps/grpc/include/grpcpp/impl/interceptor_common.h @@ -25,7 +25,6 @@ #include "absl/log/absl_check.h" #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/impl/metadata_map.h b/deps/grpc/include/grpcpp/impl/metadata_map.h index 6ac9ed2984..6241df0c25 100644 --- a/deps/grpc/include/grpcpp/impl/metadata_map.h +++ b/deps/grpc/include/grpcpp/impl/metadata_map.h @@ -22,7 +22,6 @@ #include #include -#include #include namespace grpc { diff --git a/deps/grpc/include/grpcpp/impl/proto_utils.h b/deps/grpc/include/grpcpp/impl/proto_utils.h index 20d1435842..d738ff3ab6 100644 --- a/deps/grpc/include/grpcpp/impl/proto_utils.h +++ b/deps/grpc/include/grpcpp/impl/proto_utils.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -61,7 +60,9 @@ Status GenericSerialize(const grpc::protobuf::MessageLite& msg, ByteBuffer* bb, return grpc::Status::OK; } ProtoBufferWriter writer(bb, kProtoBufferWriterMaxBufferLength, byte_size); - return msg.SerializeToZeroCopyStream(&writer) + protobuf::io::CodedOutputStream cs(&writer); + msg.SerializeWithCachedSizes(&cs); + return !cs.HadError() ? grpc::Status::OK : Status(StatusCode::INTERNAL, "Failed to serialize message"); } diff --git a/deps/grpc/include/grpcpp/impl/server_callback_handlers.h b/deps/grpc/include/grpcpp/impl/server_callback_handlers.h index c097ab2ace..7a4b6cf9ae 100644 --- a/deps/grpc/include/grpcpp/impl/server_callback_handlers.h +++ b/deps/grpc/include/grpcpp/impl/server_callback_handlers.h @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/impl/service_type.h b/deps/grpc/include/grpcpp/impl/service_type.h index 3e40e08b29..b6af6e1fc9 100644 --- a/deps/grpc/include/grpcpp/impl/service_type.h +++ b/deps/grpc/include/grpcpp/impl/service_type.h @@ -21,7 +21,6 @@ #include "absl/log/absl_check.h" -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/impl/sync.h b/deps/grpc/include/grpcpp/impl/sync.h index 132e376d7a..a7ec965a00 100644 --- a/deps/grpc/include/grpcpp/impl/sync.h +++ b/deps/grpc/include/grpcpp/impl/sync.h @@ -30,7 +30,6 @@ #include "absl/log/absl_check.h" #include "absl/synchronization/mutex.h" -#include #include #include diff --git a/deps/grpc/include/grpcpp/security/credentials.h b/deps/grpc/include/grpcpp/security/credentials.h index 402dd9edb2..d1f8c22846 100644 --- a/deps/grpc/include/grpcpp/security/credentials.h +++ b/deps/grpc/include/grpcpp/security/credentials.h @@ -247,7 +247,7 @@ class MetadataCredentialsPlugin { /// Type of credentials this plugin is implementing. virtual const char* GetType() const { return ""; } - /// Gets the auth metatada produced by this plugin. + /// Gets the auth metadata produced by this plugin. /// The fully qualified method name is: /// service_url + "/" + method_name. /// The channel_auth_context contains (among other things), the identity of @@ -295,7 +295,7 @@ grpc::Status StsCredentialsOptionsFromJson(const std::string& json_string, /// Creates STS credentials options from the $STS_CREDENTIALS environment /// variable. This environment variable points to the path of a JSON file -/// comforming to the schema described above. +/// conforming to the schema described above. grpc::Status StsCredentialsOptionsFromEnv(StsCredentialsOptions* options); std::shared_ptr StsCredentials( diff --git a/deps/grpc/include/grpcpp/security/server_credentials.h b/deps/grpc/include/grpcpp/security/server_credentials.h index e3f5c2bbbf..aa602cf4e6 100644 --- a/deps/grpc/include/grpcpp/security/server_credentials.h +++ b/deps/grpc/include/grpcpp/security/server_credentials.h @@ -116,9 +116,6 @@ std::shared_ptr AltsServerCredentials( const AltsServerCredentialsOptions& options); /// Builds Local ServerCredentials. -std::shared_ptr AltsServerCredentials( - const AltsServerCredentialsOptions& options); - std::shared_ptr LocalServerCredentials( grpc_local_connect_type type); diff --git a/deps/grpc/include/grpcpp/security/tls_certificate_provider.h b/deps/grpc/include/grpcpp/security/tls_certificate_provider.h index 3e7c952315..6b918fec0a 100644 --- a/deps/grpc/include/grpcpp/security/tls_certificate_provider.h +++ b/deps/grpc/include/grpcpp/security/tls_certificate_provider.h @@ -24,7 +24,6 @@ #include #include #include -#include #include namespace grpc { diff --git a/deps/grpc/include/grpcpp/security/tls_certificate_verifier.h b/deps/grpc/include/grpcpp/security/tls_certificate_verifier.h index 61c0acb0fb..5b87b1a42c 100644 --- a/deps/grpc/include/grpcpp/security/tls_certificate_verifier.h +++ b/deps/grpc/include/grpcpp/security/tls_certificate_verifier.h @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/security/tls_credentials_options.h b/deps/grpc/include/grpcpp/security/tls_credentials_options.h index 11c40f0408..c47f348cca 100644 --- a/deps/grpc/include/grpcpp/security/tls_credentials_options.h +++ b/deps/grpc/include/grpcpp/security/tls_credentials_options.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/server_builder.h b/deps/grpc/include/grpcpp/server_builder.h index e66ca4301c..787cb20af7 100644 --- a/deps/grpc/include/grpcpp/server_builder.h +++ b/deps/grpc/include/grpcpp/server_builder.h @@ -297,7 +297,7 @@ class ServerBuilder { // Creates a passive listener for Server Endpoint injection. /// - /// \a PasiveListener lets applications provide pre-established connections + /// \a PassiveListener lets applications provide pre-established connections /// to gRPC Servers. The server will behave as if it accepted the connection /// itself on its own listening addresses. /// diff --git a/deps/grpc/include/grpcpp/server_interface.h b/deps/grpc/include/grpcpp/server_interface.h index 266b85313c..9791ee3589 100644 --- a/deps/grpc/include/grpcpp/server_interface.h +++ b/deps/grpc/include/grpcpp/server_interface.h @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/async_stream.h b/deps/grpc/include/grpcpp/support/async_stream.h index ca849fd348..c4cbb9dbb4 100644 --- a/deps/grpc/include/grpcpp/support/async_stream.h +++ b/deps/grpc/include/grpcpp/support/async_stream.h @@ -22,7 +22,6 @@ #include "absl/log/absl_check.h" #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/async_unary_call.h b/deps/grpc/include/grpcpp/support/async_unary_call.h index 715093fa77..a03a9b2838 100644 --- a/deps/grpc/include/grpcpp/support/async_unary_call.h +++ b/deps/grpc/include/grpcpp/support/async_unary_call.h @@ -22,7 +22,6 @@ #include "absl/log/absl_check.h" #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/byte_buffer.h b/deps/grpc/include/grpcpp/support/byte_buffer.h index 5bbfb66496..676d3cfad7 100644 --- a/deps/grpc/include/grpcpp/support/byte_buffer.h +++ b/deps/grpc/include/grpcpp/support/byte_buffer.h @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -59,7 +58,7 @@ class GrpcByteBufferPeer; /// A sequence of bytes. class ByteBuffer final { public: - /// Constuct an empty buffer. + /// Construct an empty buffer. ByteBuffer() : buffer_(nullptr) {} /// Construct buffer from \a slices, of which there are \a nslices. diff --git a/deps/grpc/include/grpcpp/support/callback_common.h b/deps/grpc/include/grpcpp/support/callback_common.h index 0de9cbcf05..49eaa56172 100644 --- a/deps/grpc/include/grpcpp/support/callback_common.h +++ b/deps/grpc/include/grpcpp/support/callback_common.h @@ -25,11 +25,11 @@ #include #include -#include #include #include #include #include +#include #include namespace grpc { @@ -127,7 +127,18 @@ class CallbackWithStatusTag : public grpc_completion_queue_functor { auto status = std::move(status_); func_ = nullptr; // reset to clear this out for sure status_ = Status(); // reset to clear this out for sure - CatchingCallback(std::move(func), std::move(status)); + GetGlobalCallbackHook()->RunCallback( + call_, [func = std::move(func), status = std::move(status)]() { +#if GRPC_ALLOW_EXCEPTIONS + try { + func(status); + } catch (...) { + // nothing to return or change here, just don't crash the library + } +#else // GRPC_ALLOW_EXCEPTIONS + func(status); +#endif // GRPC_ALLOW_EXCEPTIONS + }); grpc_call_unref(call_); } }; @@ -214,7 +225,17 @@ class CallbackWithSuccessTag : public grpc_completion_queue_functor { #endif if (do_callback) { - CatchingCallback(func_, ok); + GetGlobalCallbackHook()->RunCallback(call_, [this, ok]() { +#if GRPC_ALLOW_EXCEPTIONS + try { + func_(ok); + } catch (...) { + // nothing to return or change here, just don't crash the library + } +#else // GRPC_ALLOW_EXCEPTIONS + func_(ok); +#endif // GRPC_ALLOW_EXCEPTIONS + }); } } }; diff --git a/deps/grpc/include/grpcpp/support/client_callback.h b/deps/grpc/include/grpcpp/support/client_callback.h index f306b26b96..692dff6b8d 100644 --- a/deps/grpc/include/grpcpp/support/client_callback.h +++ b/deps/grpc/include/grpcpp/support/client_callback.h @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/client_interceptor.h b/deps/grpc/include/grpcpp/support/client_interceptor.h index 67aee26ec3..fbf554437b 100644 --- a/deps/grpc/include/grpcpp/support/client_interceptor.h +++ b/deps/grpc/include/grpcpp/support/client_interceptor.h @@ -24,7 +24,6 @@ #include "absl/log/absl_check.h" -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/config.h b/deps/grpc/include/grpcpp/support/config.h index c846c43c6e..a491328785 100644 --- a/deps/grpc/include/grpcpp/support/config.h +++ b/deps/grpc/include/grpcpp/support/config.h @@ -35,7 +35,7 @@ namespace grpc { // Using grpc::string and grpc::to_string is discouraged in favor of // std::string and std::to_string. This is only for legacy code using -// them explictly. +// them explicitly. using std::string; // deprecated // NOLINT(misc-unused-using-decls) using std::to_string; // deprecated // NOLINT(misc-unused-using-decls) diff --git a/deps/grpc/include/grpcpp/support/global_callback_hook.h b/deps/grpc/include/grpcpp/support/global_callback_hook.h new file mode 100644 index 0000000000..c453bc807f --- /dev/null +++ b/deps/grpc/include/grpcpp/support/global_callback_hook.h @@ -0,0 +1,58 @@ +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef GRPCPP_SUPPORT_GLOBAL_CALLBACK_HOOK_H +#define GRPCPP_SUPPORT_GLOBAL_CALLBACK_HOOK_H + +#include "absl/functional/function_ref.h" + +struct grpc_call; + +namespace grpc { + +class GlobalCallbackHook { + public: + virtual ~GlobalCallbackHook() = default; + virtual void RunCallback(grpc_call* call, + absl::FunctionRef callback) = 0; + + protected: + // An exception-safe way of invoking a user-specified callback function. + template + void CatchingCallback(Func&& func, Args&&... args) { +#if GRPC_ALLOW_EXCEPTIONS + try { + func(std::forward(args)...); + } catch (...) { + // nothing to return or change here, just don't crash the library + } +#else // GRPC_ALLOW_EXCEPTIONS + func(std::forward(args)...); +#endif // GRPC_ALLOW_EXCEPTIONS + } +}; + +class DefaultGlobalCallbackHook final : public GlobalCallbackHook { + public: + void RunCallback(grpc_call* call, + absl::FunctionRef callback) override { + CatchingCallback(callback); + } +}; + +std::shared_ptr GetGlobalCallbackHook(); +void SetGlobalCallbackHook(GlobalCallbackHook* hook); +} // namespace grpc + +#endif // GRPCPP_SUPPORT_GLOBAL_CALLBACK_HOOK_H diff --git a/deps/grpc/include/grpcpp/support/interceptor.h b/deps/grpc/include/grpcpp/support/interceptor.h index 9248fbb28c..1e4d66610f 100644 --- a/deps/grpc/include/grpcpp/support/interceptor.h +++ b/deps/grpc/include/grpcpp/support/interceptor.h @@ -133,7 +133,7 @@ class InterceptorBatchMethods { /// means that the payload would be available in the serialized form only /// unless an interceptor replaces the payload with ModifySendMessage. - /// Returns a modifable ByteBuffer holding the serialized form of the message + /// Returns a modifiable ByteBuffer holding the serialized form of the message /// that is going to be sent. Valid for PRE_SEND_MESSAGE interceptions. /// A return value of nullptr indicates that this ByteBuffer is not valid. virtual ByteBuffer* GetSerializedSendMessage() = 0; diff --git a/deps/grpc/include/grpcpp/support/method_handler.h b/deps/grpc/include/grpcpp/support/method_handler.h index 6a2d2b22d2..081401b187 100644 --- a/deps/grpc/include/grpcpp/support/method_handler.h +++ b/deps/grpc/include/grpcpp/support/method_handler.h @@ -22,7 +22,6 @@ #include "absl/log/absl_check.h" #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/proto_buffer_reader.h b/deps/grpc/include/grpcpp/support/proto_buffer_reader.h index e5ede7a09a..7bdf8d13d7 100644 --- a/deps/grpc/include/grpcpp/support/proto_buffer_reader.h +++ b/deps/grpc/include/grpcpp/support/proto_buffer_reader.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/proto_buffer_writer.h b/deps/grpc/include/grpcpp/support/proto_buffer_writer.h index e695f14ae1..1417a61991 100644 --- a/deps/grpc/include/grpcpp/support/proto_buffer_writer.h +++ b/deps/grpc/include/grpcpp/support/proto_buffer_writer.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/server_interceptor.h b/deps/grpc/include/grpcpp/support/server_interceptor.h index 1147235b6b..de875a347f 100644 --- a/deps/grpc/include/grpcpp/support/server_interceptor.h +++ b/deps/grpc/include/grpcpp/support/server_interceptor.h @@ -24,7 +24,6 @@ #include "absl/log/absl_check.h" -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/support/sync_stream.h b/deps/grpc/include/grpcpp/support/sync_stream.h index 9b16b07013..7479adb25c 100644 --- a/deps/grpc/include/grpcpp/support/sync_stream.h +++ b/deps/grpc/include/grpcpp/support/sync_stream.h @@ -21,7 +21,6 @@ #include "absl/log/absl_check.h" -#include #include #include #include diff --git a/deps/grpc/include/grpcpp/version_info.h b/deps/grpc/include/grpcpp/version_info.h index 2e1c386735..7e6f81904d 100644 --- a/deps/grpc/include/grpcpp/version_info.h +++ b/deps/grpc/include/grpcpp/version_info.h @@ -19,9 +19,9 @@ #define GRPCPP_VERSION_INFO_H #define GRPC_CPP_VERSION_MAJOR 1 -#define GRPC_CPP_VERSION_MINOR 65 -#define GRPC_CPP_VERSION_PATCH 2 +#define GRPC_CPP_VERSION_MINOR 67 +#define GRPC_CPP_VERSION_PATCH 1 #define GRPC_CPP_VERSION_TAG "" -#define GRPC_CPP_VERSION_STRING "1.65.2" +#define GRPC_CPP_VERSION_STRING "1.67.1" #endif // GRPCPP_VERSION_INFO_H diff --git a/deps/grpc/src/compiler/.clang-format b/deps/grpc/src/compiler/.clang-format deleted file mode 100644 index 5f150ef6ed..0000000000 --- a/deps/grpc/src/compiler/.clang-format +++ /dev/null @@ -1,50 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -DerivePointerAlignment: false -PointerAlignment: Left -IncludeBlocks: Regroup -IncludeCategories: - # ruby.h is even more first if it's included - - Regex: '^' - Priority: -200 - # Some platforms (namely msys) need wchar to be included BEFORE - # anything else, especially strsafe.h. - - Regex: '^' - Priority: 5 - # use priority 100+ for grpc headers so they sort last - # 'system' headers - include things that have " in the names to make them - # stand out and get fixed - - Regex: '^(<|")grpc' - Priority: 100 - # similary using include/ to get system headers should stand out and get - # fixed - - Regex: '^"include/' - Priority: 100 - # source headers go last - - Regex: '^"(src|test)/' - Priority: 101 - # not-grpc headers follow - # first, non system headers that are included like <> - these are all - # local carveouts, and get sorted below c++ but before non grpc "" files - - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)' - Priority: 30 - # first C system headers - they have a . in the filename - - Regex: '^<.*\.' - Priority: 10 - # then C++ system headers - no ., the only thing that will match now - - Regex: '^<' - Priority: 20 - # finally other "" includes go between system headers and our headers - - Regex: '^"' - Priority: 40 ---- -Language: ObjC -BasedOnStyle: Google -ColumnLimit: 100 -ObjCBlockIndentWidth: 2 ---- -Language: Proto -BasedOnStyle: Google -ColumnLimit: 100 -... diff --git a/deps/grpc/src/compiler/BUILD b/deps/grpc/src/compiler/BUILD deleted file mode 100644 index e787a96b60..0000000000 --- a/deps/grpc/src/compiler/BUILD +++ /dev/null @@ -1,129 +0,0 @@ -# gRPC Bazel BUILD file. -# -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load( - "//bazel:grpc_build_system.bzl", - "grpc_cc_library", - "grpc_proto_plugin", -) - -package( - default_visibility = ["//visibility:public"], - features = [ - "-layering_check", - "-parse_headers", - ], -) - -licenses(["notice"]) - -exports_files(["LICENSE"]) - -grpc_cc_library( - name = "proto_parser_helper", - srcs = ["proto_parser_helper.cc"], - hdrs = ["proto_parser_helper.h"], - language = "c++", -) - -grpc_cc_library( - name = "grpc_plugin_support", - srcs = [ - "cpp_generator.cc", - "csharp_generator.cc", - "node_generator.cc", - "objective_c_generator.cc", - "php_generator.cc", - "python_generator.cc", - "ruby_generator.cc", - ], - hdrs = [ - "config.h", - "config_protobuf.h", - "cpp_generator.h", - "cpp_generator_helpers.h", - "cpp_plugin.h", - "csharp_generator.h", - "csharp_generator_helpers.h", - "generator_helpers.h", - "node_generator.h", - "node_generator_helpers.h", - "objective_c_generator.h", - "objective_c_generator_helpers.h", - "php_generator.h", - "php_generator_helpers.h", - "protobuf_plugin.h", - "python_generator.h", - "python_generator_helpers.h", - "python_private_generator.h", - "ruby_generator.h", - "ruby_generator_helpers-inl.h", - "ruby_generator_map-inl.h", - "ruby_generator_string-inl.h", - "schema_interface.h", - ], - external_deps = [ - "protobuf_clib", - "protobuf", - ], - language = "c++", - deps = [ - "proto_parser_helper", - "//:grpc++_config_proto", - ], -) - -grpc_proto_plugin( - name = "grpc_cpp_plugin", - srcs = ["cpp_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_csharp_plugin", - srcs = ["csharp_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_node_plugin", - srcs = ["node_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_objective_c_plugin", - srcs = ["objective_c_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_php_plugin", - srcs = ["php_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_python_plugin", - srcs = ["python_plugin.cc"], - deps = [":grpc_plugin_support"], -) - -grpc_proto_plugin( - name = "grpc_ruby_plugin", - srcs = ["ruby_plugin.cc"], - deps = [":grpc_plugin_support"], -) diff --git a/deps/grpc/src/compiler/README.md b/deps/grpc/src/compiler/README.md deleted file mode 100644 index d5684af7ff..0000000000 --- a/deps/grpc/src/compiler/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Overview - -This directory contains source code for gRPC protocol buffer compiler (*protoc*) plugins. Along with `protoc`, -these plugins are used to generate gRPC client and server stubs from `.proto` files. diff --git a/deps/grpc/src/compiler/config.h b/deps/grpc/src/compiler/config.h deleted file mode 100644 index 49c78755b5..0000000000 --- a/deps/grpc/src/compiler/config.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef SRC_COMPILER_CONFIG_H -#define SRC_COMPILER_CONFIG_H - -#include - -#include "src/compiler/config_protobuf.h" - -#ifdef GRPC_CUSTOM_STRING -#warning GRPC_CUSTOM_STRING is no longer supported. Please use std::string. -#endif - -namespace grpc { - -// Using grpc::string and grpc::to_string is discouraged in favor of -// std::string and std::to_string. This is only for legacy code using -// them explictly. -using std::string; // deprecated -using std::to_string; // deprecated - -namespace protobuf { - -namespace compiler { -typedef GRPC_CUSTOM_CODEGENERATOR CodeGenerator; -typedef GRPC_CUSTOM_GENERATORCONTEXT GeneratorContext; -static inline int PluginMain(int argc, char* argv[], - const CodeGenerator* generator) { - return GRPC_CUSTOM_PLUGINMAIN(argc, argv, generator); -} -static inline void ParseGeneratorParameter( - const string& parameter, std::vector >* options) { - GRPC_CUSTOM_PARSEGENERATORPARAMETER(parameter, options); -} - -} // namespace compiler -namespace io { -typedef GRPC_CUSTOM_PRINTER Printer; -typedef GRPC_CUSTOM_CODEDOUTPUTSTREAM CodedOutputStream; -typedef GRPC_CUSTOM_STRINGOUTPUTSTREAM StringOutputStream; -} // namespace io -} // namespace protobuf -} // namespace grpc - -namespace grpc_cpp_generator { - -static const char* const kCppGeneratorMessageHeaderExt = ".pb.h"; -static const char* const kCppGeneratorServiceHeaderExt = ".grpc.pb.h"; - -} // namespace grpc_cpp_generator - -#endif // SRC_COMPILER_CONFIG_H diff --git a/deps/grpc/src/compiler/config_protobuf.h b/deps/grpc/src/compiler/config_protobuf.h deleted file mode 100644 index dc0178afaa..0000000000 --- a/deps/grpc/src/compiler/config_protobuf.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef SRC_COMPILER_CONFIG_PROTOBUF_H -#define SRC_COMPILER_CONFIG_PROTOBUF_H - -#include - -#ifndef GRPC_CUSTOM_CODEGENERATOR -#include -#define GRPC_CUSTOM_CODEGENERATOR ::google::protobuf::compiler::CodeGenerator -#define GRPC_CUSTOM_GENERATORCONTEXT \ - ::google::protobuf::compiler::GeneratorContext -#endif - -#ifndef GRPC_CUSTOM_PRINTER -#include -#include -#include -#define GRPC_CUSTOM_PRINTER ::google::protobuf::io::Printer -#define GRPC_CUSTOM_CODEDOUTPUTSTREAM ::google::protobuf::io::CodedOutputStream -#define GRPC_CUSTOM_STRINGOUTPUTSTREAM \ - ::google::protobuf::io::StringOutputStream -#endif - -#ifndef GRPC_CUSTOM_PLUGINMAIN -#include -#define GRPC_CUSTOM_PLUGINMAIN ::google::protobuf::compiler::PluginMain -#endif - -#ifndef GRPC_CUSTOM_PARSEGENERATORPARAMETER -#include -#define GRPC_CUSTOM_PARSEGENERATORPARAMETER \ - ::google::protobuf::compiler::ParseGeneratorParameter -#endif - -#ifndef GRPC_CUSTOM_CSHARP_GETCLASSNAME -#include -#define GRPC_CUSTOM_CSHARP_GETCLASSNAME \ - ::google::protobuf::compiler::csharp::GetClassName -#define GRPC_CUSTOM_CSHARP_GETFILENAMESPACE \ - ::google::protobuf::compiler::csharp::GetFileNamespace -#define GRPC_CUSTOM_CSHARP_GETOUTPUTFILE \ - ::google::protobuf::compiler::csharp::GetOutputFile -#define GRPC_CUSTOM_CSHARP_GETREFLECTIONCLASSNAME \ - ::google::protobuf::compiler::csharp::GetReflectionClassName -#endif - -#endif // SRC_COMPILER_CONFIG_PROTOBUF_H diff --git a/deps/grpc/src/compiler/cpp_generator.cc b/deps/grpc/src/compiler/cpp_generator.cc deleted file mode 100644 index 15470a191d..0000000000 --- a/deps/grpc/src/compiler/cpp_generator.cc +++ /dev/null @@ -1,2501 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/cpp_generator.h" - -#include -#include -#include - -namespace grpc_cpp_generator { -namespace { - -template -std::string as_string(T x) { - std::ostringstream out; - out << x; - return out.str(); -} - -inline bool ClientOnlyStreaming(const grpc_generator::Method* method) { - return method->ClientStreaming() && !method->ServerStreaming(); -} - -inline bool ServerOnlyStreaming(const grpc_generator::Method* method) { - return !method->ClientStreaming() && method->ServerStreaming(); -} - -std::string FilenameIdentifier(const std::string& filename) { - std::string result; - for (unsigned i = 0; i < filename.size(); i++) { - char c = filename[i]; - if (isalnum(c)) { - result.push_back(c); - } else { - static char hex[] = "0123456789abcdef"; - result.push_back('_'); - result.push_back(hex[(c >> 4) & 0xf]); - result.push_back(hex[c & 0xf]); - } - } - return result; -} - -} // namespace - -template -T* array_end(T (&array)[N]) { - return array + N; -} - -void PrintIncludes(grpc_generator::Printer* printer, - const std::vector& headers, - bool use_system_headers, const std::string& search_path) { - std::map vars; - - vars["l"] = use_system_headers ? '<' : '"'; - vars["r"] = use_system_headers ? '>' : '"'; - - if (!search_path.empty()) { - vars["l"] += search_path; - if (search_path[search_path.size() - 1] != '/') { - vars["l"] += '/'; - } - } - - for (auto i = headers.begin(); i != headers.end(); i++) { - vars["h"] = *i; - printer->Print(vars, "#include $l$$h$$r$\n"); - } -} - -std::string GetHeaderPrologue(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - vars["filename"] = file->filename(); - vars["filename_identifier"] = FilenameIdentifier(file->filename()); - vars["filename_base"] = file->filename_without_ext(); - vars["message_header_ext"] = params.message_header_extension.empty() - ? kCppGeneratorMessageHeaderExt - : params.message_header_extension; - - printer->Print(vars, "// Generated by the gRPC C++ plugin.\n"); - printer->Print(vars, - "// If you make any local change, they will be lost.\n"); - printer->Print(vars, "// source: $filename$\n"); - std::string leading_comments = file->GetLeadingComments("//"); - if (!leading_comments.empty()) { - printer->Print(vars, "// Original file comments:\n"); - printer->PrintRaw(leading_comments.c_str()); - } - printer->Print(vars, "#ifndef GRPC_$filename_identifier$__INCLUDED\n"); - printer->Print(vars, "#define GRPC_$filename_identifier$__INCLUDED\n"); - printer->Print(vars, "\n"); - printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n"); - printer->Print(vars, file->additional_headers().c_str()); - printer->Print(vars, "\n"); - } - return output; -} - -// Convert from "a/b/c.proto" to "#include \"a/b/c$message_header_ext$\"\n" -std::string ImportInludeFromProtoName(const std::string& proto_name) { - return std::string("#include \"") + - proto_name.substr(0, proto_name.size() - 6) + - std::string("$message_header_ext$\"\n"); -} - -std::string GetHeaderIncludes(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - if (!params.additional_header_includes.empty()) { - PrintIncludes(printer.get(), params.additional_header_includes, false, - ""); - } - static const char* headers_strs[] = { - "functional", - "grpcpp/generic/async_generic_service.h", - "grpcpp/support/async_stream.h", - "grpcpp/support/async_unary_call.h", - "grpcpp/support/client_callback.h", - "grpcpp/client_context.h", - "grpcpp/completion_queue.h", - "grpcpp/support/message_allocator.h", - "grpcpp/support/method_handler.h", - "grpcpp/impl/proto_utils.h", - "grpcpp/impl/rpc_method.h", - "grpcpp/support/server_callback.h", - "grpcpp/impl/server_callback_handlers.h", - "grpcpp/server_context.h", - "grpcpp/impl/service_type.h", - "grpcpp/support/status.h", - "grpcpp/support/stub_options.h", - "grpcpp/support/sync_stream.h", - }; - std::vector headers(headers_strs, array_end(headers_strs)); - PrintIncludes(printer.get(), headers, params.use_system_headers, - params.grpc_search_path); - printer->Print(vars, "\n"); - - vars["message_header_ext"] = params.message_header_extension.empty() - ? kCppGeneratorMessageHeaderExt - : params.message_header_extension; - - if (params.include_import_headers) { - const std::vector import_names = file->GetImportNames(); - for (const auto& import_name : import_names) { - const std::string include_name = ImportInludeFromProtoName(import_name); - printer->Print(vars, include_name.c_str()); - } - printer->PrintRaw("\n"); - } - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - - for (auto part = parts.begin(); part != parts.end(); part++) { - vars["part"] = *part; - printer->Print(vars, "namespace $part$ {\n"); - } - printer->Print(vars, "\n"); - } - } - return output; -} - -void PrintHeaderClientMethodInterfaces(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars, - bool is_public) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - - struct { - std::string prefix; - std::string method_params; // extra arguments to method - std::string raw_args; // extra arguments to raw version of method - } async_prefixes[] = {{"Async", ", void* tag", ", tag"}, - {"PrepareAsync", "", ""}}; - - if (is_public) { - if (method->NoStreaming()) { - printer->Print( - *vars, - "virtual ::grpc::Status $Method$(::grpc::ClientContext* context, " - "const $Request$& request, $Response$* response) = 0;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - printer->Print( - *vars, - "std::unique_ptr< " - "::grpc::ClientAsyncResponseReaderInterface< $Response$>> " - "$AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncResponseReaderInterface< $Response$>>(" - "$AsyncPrefix$$Method$Raw(context, request, cq));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientWriterInterface< $Request$>>" - " $Method$(" - "::grpc::ClientContext* context, $Response$* response) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< ::grpc::ClientWriterInterface< $Request$>>" - "($Method$Raw(context, response));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncWriterInterface< $Request$>>" - " $AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "$Response$* " - "response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print(*vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncWriterInterface< $Request$>>(" - "$AsyncPrefix$$Method$Raw(context, response, " - "cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientReaderInterface< $Response$>>" - " $Method$(::grpc::ClientContext* context, const $Request$& request)" - " {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< ::grpc::ClientReaderInterface< $Response$>>" - "($Method$Raw(context, request));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncReaderInterface< " - "$Response$>> " - "$AsyncPrefix$$Method$(" - "::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print(*vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncReaderInterface< $Response$>>(" - "$AsyncPrefix$$Method$Raw(context, request, " - "cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "std::unique_ptr< ::grpc::ClientReaderWriterInterface< " - "$Request$, $Response$>> " - "$Method$(::grpc::ClientContext* context) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< " - "::grpc::ClientReaderWriterInterface< $Request$, $Response$>>(" - "$Method$Raw(context));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< " - "::grpc::ClientAsyncReaderWriterInterface< $Request$, " - "$Response$>> " - "$AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncReaderWriterInterface< $Request$, " - "$Response$>>(" - "$AsyncPrefix$$Method$Raw(context, cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } - } else { - if (method->NoStreaming()) { - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - printer->Print( - *vars, - "virtual ::grpc::ClientAsyncResponseReaderInterface< " - "$Response$>* " - "$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) = 0;\n"); - } - } - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - "virtual ::grpc::ClientWriterInterface< $Request$>*" - " $Method$Raw(" - "::grpc::ClientContext* context, $Response$* response) = 0;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - printer->Print( - *vars, - "virtual ::grpc::ClientAsyncWriterInterface< $Request$>*" - " $AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, " - "$Response$* response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "virtual ::grpc::ClientReaderInterface< $Response$>* " - "$Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request) = 0;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - printer->Print( - *vars, - "virtual ::grpc::ClientAsyncReaderInterface< $Response$>* " - "$AsyncPrefix$$Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "virtual ::grpc::ClientReaderWriterInterface< $Request$, " - "$Response$>* " - "$Method$Raw(::grpc::ClientContext* context) = 0;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - printer->Print( - *vars, - "virtual ::grpc::ClientAsyncReaderWriterInterface< " - "$Request$, $Response$>* " - "$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n"); - } - } - } - } -} - -void PrintHeaderClientMethod(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars, - bool is_public) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - struct { - std::string prefix; - std::string method_params; // extra arguments to method - std::string raw_args; // extra arguments to raw version of method - } async_prefixes[] = {{"Async", ", void* tag", ", tag"}, - {"PrepareAsync", "", ""}}; - - if (is_public) { - if (method->NoStreaming()) { - printer->Print( - *vars, - "::grpc::Status $Method$(::grpc::ClientContext* context, " - "const $Request$& request, $Response$* response) override;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncResponseReader< " - "$Response$>> " - "$AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) {\n"); - printer->Indent(); - printer->Print(*vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncResponseReader< $Response$>>(" - "$AsyncPrefix$$Method$Raw(context, request, cq));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientWriter< $Request$>>" - " $Method$(" - "::grpc::ClientContext* context, $Response$* response) {\n"); - printer->Indent(); - printer->Print(*vars, - "return std::unique_ptr< ::grpc::ClientWriter< $Request$>>" - "($Method$Raw(context, response));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>" - " $AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "$Response$* response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>(" - "$AsyncPrefix$$Method$Raw(context, response, " - "cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientReader< $Response$>>" - " $Method$(::grpc::ClientContext* context, const $Request$& request)" - " {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< ::grpc::ClientReader< $Response$>>" - "($Method$Raw(context, request));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>> " - "$AsyncPrefix$$Method$(" - "::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>>(" - "$AsyncPrefix$$Method$Raw(context, request, " - "cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientReaderWriter< $Request$, $Response$>>" - " $Method$(::grpc::ClientContext* context) {\n"); - printer->Indent(); - printer->Print(*vars, - "return std::unique_ptr< " - "::grpc::ClientReaderWriter< $Request$, $Response$>>(" - "$Method$Raw(context));\n"); - printer->Outdent(); - printer->Print("}\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "std::unique_ptr< ::grpc::ClientAsyncReaderWriter< " - "$Request$, $Response$>> " - "$AsyncPrefix$$Method$(::grpc::ClientContext* context, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Indent(); - printer->Print( - *vars, - "return std::unique_ptr< " - "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>>(" - "$AsyncPrefix$$Method$Raw(context, cq$AsyncRawArgs$));\n"); - printer->Outdent(); - printer->Print("}\n"); - } - } - } - } else { - if (method->NoStreaming()) { - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - printer->Print( - *vars, - "::grpc::ClientAsyncResponseReader< $Response$>* " - "$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) override;\n"); - } - } - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::ClientWriter< $Request$>* $Method$Raw(" - "::grpc::ClientContext* context, $Response$* response) " - "override;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "::grpc::ClientAsyncWriter< $Request$>* $AsyncPrefix$$Method$Raw(" - "::grpc::ClientContext* context, $Response$* response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::ClientReader< $Response$>* $Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request)" - " override;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "::grpc::ClientAsyncReader< $Response$>* " - "$AsyncPrefix$$Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "::grpc::ClientReaderWriter< $Request$, $Response$>* " - "$Method$Raw(::grpc::ClientContext* context) override;\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncRawArgs"] = async_prefix.raw_args; - printer->Print( - *vars, - "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* " - "$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n"); - } - } - } - } -} - -void PrintHeaderClientMethodCallbackInterfacesStart( - grpc_generator::Printer* printer, - std::map* /*vars*/) { - // This declares the interface for the callback-based API. The components - // are pure; even though this is new (post-1.0) API, it can be pure because - // it is an entirely new interface that happens to be scoped within - // StubInterface, not new additions to StubInterface itself - printer->Print("class async_interface {\n"); - // All methods in this new interface are public. There is no need for private - // "Raw" methods since the callback-based API returns unowned raw pointers - printer->Print(" public:\n"); - printer->Indent(); - printer->Print("virtual ~async_interface() {}\n"); -} - -void PrintHeaderClientMethodCallbackInterfaces( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - - if (method->NoStreaming()) { - printer->Print(*vars, - "virtual void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "std::function) = 0;\n"); - printer->Print(*vars, - "virtual void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "::grpc::ClientUnaryReactor* reactor) = 0;\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "virtual void $Method$(::grpc::ClientContext* context, " - "$Response$* response, " - "::grpc::ClientWriteReactor< $Request$>* " - "reactor) = 0;\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print(*vars, - "virtual void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, " - "::grpc::ClientReadReactor< $Response$>* " - "reactor) = 0;\n"); - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "virtual void $Method$(::grpc::ClientContext* context, " - "::grpc::ClientBidiReactor< " - "$Request$,$Response$>* reactor) = 0;\n"); - } -} - -void PrintHeaderClientMethodCallbackInterfacesEnd( - grpc_generator::Printer* printer, - std::map* /*vars*/) { - printer->Outdent(); - printer->Print("};\n"); - // TODO: Remove typedef when all uses of experimental_async are migrated off. - printer->Print( - "typedef class async_interface experimental_async_interface;\n"); - - // Declare a function to give the async stub contents. It can't be pure - // since this is a new API in StubInterface, but it is meaningless by default - // (since any stub that wants to use it must have its own implementation of - // the callback functions therein), so make the default return value nullptr. - // Intentionally include the word "class" to avoid possible shadowing. - // TODO: Remove experimental_async call when possible, replace with nullptr. - printer->Print( - "virtual class async_interface* async() { return nullptr; }\n"); - - // TODO: Remove experimental_async call when possible. - printer->Print( - "class async_interface* experimental_async() { return async(); }\n"); -} - -void PrintHeaderClientMethodCallbackStart( - grpc_generator::Printer* printer, - std::map* /*vars*/) { - // This declares the stub entry for the callback-based API. - printer->Print("class async final :\n"); - printer->Print(" public StubInterface::async_interface {\n"); - printer->Print(" public:\n"); - printer->Indent(); -} - -void PrintHeaderClientMethodCallback(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - - if (method->NoStreaming()) { - printer->Print(*vars, - "void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "std::function) override;\n"); - printer->Print(*vars, - "void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "::grpc::ClientUnaryReactor* reactor) override;\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "void $Method$(::grpc::ClientContext* context, " - "$Response$* response, " - "::grpc::ClientWriteReactor< $Request$>* " - "reactor) override;\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print(*vars, - "void $Method$(::grpc::ClientContext* context, " - "const $Request$* request, " - "::grpc::ClientReadReactor< $Response$>* " - "reactor) override;\n"); - - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "void $Method$(::grpc::ClientContext* context, " - "::grpc::ClientBidiReactor< " - "$Request$,$Response$>* reactor) override;\n"); - } -} - -void PrintHeaderClientMethodCallbackEnd( - grpc_generator::Printer* printer, - std::map* /*vars*/) { - printer->Outdent(); - printer->Print(" private:\n"); - printer->Indent(); - printer->Print("friend class Stub;\n"); - printer->Print("explicit async(Stub* stub): stub_(stub) { }\n"); - // include a function with a phony use of stub_ to avoid an unused - // private member warning for service with no methods - printer->Print("Stub* stub() { return stub_; }\n"); - printer->Print("Stub* stub_;\n"); - printer->Outdent(); - printer->Print("};\n"); - - printer->Print( - "class async* async() override { " - "return &async_stub_; }\n"); -} - -void PrintHeaderClientMethodData(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - std::map* vars) { - (*vars)["Method"] = method->name(); - printer->Print(*vars, - "const ::grpc::internal::RpcMethod rpcmethod_$Method$_;\n"); -} - -void PrintHeaderServerMethodSync(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - printer->Print(method->GetLeadingComments("//").c_str()); - if (params.allow_sync_server_api) { - printer->Print("virtual "); - } - if (method->NoStreaming()) { - printer->Print(*vars, - "::grpc::Status $Method$(" - "::grpc::ServerContext* context, const $Request$* request, " - "$Response$* response);\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::Status $Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerReader< $Request$>* reader, " - "$Response$* response);\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::Status $Method$(" - "::grpc::ServerContext* context, const $Request$* request, " - "::grpc::ServerWriter< $Response$>* writer);\n"); - } else if (method->BidiStreaming()) { - printer->Print( - *vars, - "::grpc::Status $Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerReaderWriter< $Response$, $Request$>* stream);" - "\n"); - } - printer->Print(method->GetTrailingComments("//").c_str()); -} - -// Helper generator. Disables the sync API for Request and Response, then adds -// in an async API for RealRequest and RealResponse types. This is to be used -// to generate async and raw async APIs. -void PrintHeaderServerAsyncMethodsHelper( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - const Parameters& params, std::map* vars) { - if (method->NoStreaming()) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "void Request$Method$(" - "::grpc::ServerContext* context, $RealRequest$* request, " - "::grpc::ServerAsyncResponseWriter< $RealResponse$>* response, " - "::grpc::CompletionQueue* new_call_cq, " - "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n"); - printer->Print(*vars, - " ::grpc::Service::RequestAsyncUnary($Idx$, context, " - "request, response, new_call_cq, notification_cq, tag);\n"); - printer->Print("}\n"); - } else if (ClientOnlyStreaming(method)) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReader< $Request$>* /*reader*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "void Request$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerAsyncReader< $RealResponse$, $RealRequest$>* reader, " - "::grpc::CompletionQueue* new_call_cq, " - "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n"); - printer->Print(*vars, - " ::grpc::Service::RequestAsyncClientStreaming($Idx$, " - "context, reader, new_call_cq, notification_cq, tag);\n"); - printer->Print("}\n"); - } else if (ServerOnlyStreaming(method)) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "::grpc::ServerWriter< $Response$>* /*writer*/) override " - "{\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "void Request$Method$(" - "::grpc::ServerContext* context, $RealRequest$* request, " - "::grpc::ServerAsyncWriter< $RealResponse$>* writer, " - "::grpc::CompletionQueue* new_call_cq, " - "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n"); - printer->Print( - *vars, - " ::grpc::Service::RequestAsyncServerStreaming($Idx$, " - "context, request, writer, new_call_cq, notification_cq, tag);\n"); - printer->Print("}\n"); - } else if (method->BidiStreaming()) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReaderWriter< $Response$, $Request$>* /*stream*/) " - " override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "void Request$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerAsyncReaderWriter< $RealResponse$, $RealRequest$>* " - "stream, " - "::grpc::CompletionQueue* new_call_cq, " - "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n"); - printer->Print(*vars, - " ::grpc::Service::RequestAsyncBidiStreaming($Idx$, " - "context, stream, new_call_cq, notification_cq, tag);\n"); - printer->Print("}\n"); - } -} - -void PrintHeaderServerMethodAsync(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - // These will be disabled - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - // These will be used for the async API - (*vars)["RealRequest"] = method->input_type_name(); - (*vars)["RealResponse"] = method->output_type_name(); - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithAsyncMethod_$Method$ : public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, - "WithAsyncMethod_$Method$() {\n" - " ::grpc::Service::MarkMethodAsync($Idx$);\n" - "}\n"); - printer->Print(*vars, - "~WithAsyncMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - PrintHeaderServerAsyncMethodsHelper(printer, method, params, vars); - printer->Outdent(); - printer->Print(*vars, "};\n"); -} - -// Helper generator. Disables the sync API for Request and Response, then adds -// in a callback API for RealRequest and RealResponse types. This is to be used -// to generate callback and raw callback APIs. -void PrintHeaderServerCallbackMethodsHelper( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - const Parameters& params, std::map* vars) { - if (method->NoStreaming()) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print(*vars, - "virtual ::grpc::ServerUnaryReactor* $Method$(\n" - " ::grpc::CallbackServerContext* /*context*/, " - "const $RealRequest$* /*request*/, " - "$RealResponse$* /*response*/)" - " { return nullptr; }\n"); - } else if (ClientOnlyStreaming(method)) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReader< $Request$>* /*reader*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print(*vars, - "virtual ::grpc::ServerReadReactor< " - "$RealRequest$>* $Method$(\n" - " ::grpc::CallbackServerContext* " - "/*context*/, $RealResponse$* /*response*/)" - " { return nullptr; }\n"); - } else if (ServerOnlyStreaming(method)) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "::grpc::ServerWriter< $Response$>* /*writer*/) override " - "{\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "virtual ::grpc::ServerWriteReactor< $RealResponse$>* $Method$(\n" - " ::grpc::CallbackServerContext* " - "/*context*/, const $RealRequest$* /*request*/)" - " { return nullptr; }\n"); - } else if (method->BidiStreaming()) { - if (params.allow_sync_server_api) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReaderWriter< $Response$, $Request$>* /*stream*/) " - " override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - printer->Print( - *vars, - "virtual ::grpc::ServerBidiReactor< $RealRequest$, $RealResponse$>* " - "$Method$(\n" - " ::grpc::CallbackServerContext* /*context*/)\n" - " { return nullptr; }\n"); - } -} - -void PrintHeaderServerMethodCallback(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - // These will be disabled - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - // These will be used for the callback API - (*vars)["RealRequest"] = method->input_type_name(); - (*vars)["RealResponse"] = method->output_type_name(); - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithCallbackMethod_$Method$ : public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, "WithCallbackMethod_$Method$() {\n"); - if (method->NoStreaming()) { - printer->Print( - *vars, - " ::grpc::Service::MarkMethodCallback($Idx$,\n" - " new ::grpc::internal::CallbackUnaryHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "const $RealRequest$* " - "request, " - "$RealResponse$* response) { " - "return this->$Method$(context, request, response); }));}\n"); - printer->Print(*vars, - "void SetMessageAllocatorFor_$Method$(\n" - " ::grpc::MessageAllocator< " - "$RealRequest$, $RealResponse$>* allocator) {\n" - " ::grpc::internal::MethodHandler* const handler = " - "::grpc::Service::GetHandler($Idx$);\n" - " static_cast<::grpc::internal::CallbackUnaryHandler< " - "$RealRequest$, $RealResponse$>*>(handler)\n" - " ->SetMessageAllocator(allocator);\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - " ::grpc::Service::MarkMethodCallback($Idx$,\n" - " new ::grpc::internal::CallbackClientStreamingHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "$RealResponse$* " - "response) { " - "return this->$Method$(context, response); }));\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - " ::grpc::Service::MarkMethodCallback($Idx$,\n" - " new ::grpc::internal::CallbackServerStreamingHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "const $RealRequest$* " - "request) { " - "return this->$Method$(context, request); }));\n"); - } else if (method->BidiStreaming()) { - printer->Print(*vars, - " ::grpc::Service::MarkMethodCallback($Idx$,\n" - " new ::grpc::internal::CallbackBidiHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context) " - "{ return this->$Method$(context); }));\n"); - } - printer->Print(*vars, "}\n"); - printer->Print(*vars, - "~WithCallbackMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - PrintHeaderServerCallbackMethodsHelper(printer, method, params, vars); - printer->Outdent(); - printer->Print(*vars, "};\n"); -} - -void PrintHeaderServerMethodRawCallback( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - const Parameters& params, std::map* vars) { - (*vars)["Method"] = method->name(); - // These will be disabled - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - // These will be used for raw API - (*vars)["RealRequest"] = "::grpc::ByteBuffer"; - (*vars)["RealResponse"] = "::grpc::ByteBuffer"; - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithRawCallbackMethod_$Method$ : public " - "BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, "WithRawCallbackMethod_$Method$() {\n"); - if (method->NoStreaming()) { - printer->Print(*vars, - " ::grpc::Service::MarkMethodRawCallback($Idx$,\n" - " new ::grpc::internal::CallbackUnaryHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "const $RealRequest$* " - "request, " - "$RealResponse$* response) { return " - "this->$Method$(context, request, response); }));\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - " ::grpc::Service::MarkMethodRawCallback($Idx$,\n" - " new ::grpc::internal::CallbackClientStreamingHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "$RealResponse$* response) " - "{ return this->$Method$(context, response); }));\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - " ::grpc::Service::MarkMethodRawCallback($Idx$,\n" - " new ::grpc::internal::CallbackServerStreamingHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context, " - "const" - "$RealRequest$* request) { return " - "this->$Method$(context, request); }));\n"); - } else if (method->BidiStreaming()) { - printer->Print(*vars, - " ::grpc::Service::MarkMethodRawCallback($Idx$,\n" - " new ::grpc::internal::CallbackBidiHandler< " - "$RealRequest$, $RealResponse$>(\n" - " [this](\n" - " ::grpc::CallbackServerContext* context) " - "{ return this->$Method$(context); }));\n"); - } - printer->Print(*vars, "}\n"); - printer->Print(*vars, - "~WithRawCallbackMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - PrintHeaderServerCallbackMethodsHelper(printer, method, params, vars); - printer->Outdent(); - printer->Print(*vars, "};\n"); -} - -void PrintHeaderServerMethodStreamedUnary( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - if (method->NoStreaming()) { - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithStreamedUnaryMethod_$Method$ : " - "public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, - "WithStreamedUnaryMethod_$Method$() {\n" - " ::grpc::Service::MarkMethodStreamed($Idx$,\n" - " new ::grpc::internal::StreamedUnaryHandler<\n" - " $Request$, $Response$>(\n" - " [this](::grpc::ServerContext* context,\n" - " ::grpc::ServerUnaryStreamer<\n" - " $Request$, $Response$>* streamer) {\n" - " return this->Streamed$Method$(context,\n" - " streamer);\n" - " }));\n" - "}\n"); - printer->Print(*vars, - "~WithStreamedUnaryMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - printer->Print( - *vars, - "// disable regular version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - printer->Print(*vars, - "// replace default version of method with streamed unary\n" - "virtual ::grpc::Status Streamed$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerUnaryStreamer< " - "$Request$,$Response$>* server_unary_streamer)" - " = 0;\n"); - printer->Outdent(); - printer->Print(*vars, "};\n"); - } -} - -void PrintHeaderServerMethodSplitStreaming( - grpc_generator::Printer* printer, const grpc_generator::Method* method, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - if (ServerOnlyStreaming(method)) { - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithSplitStreamingMethod_$Method$ : " - "public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, - "WithSplitStreamingMethod_$Method$() {\n" - " ::grpc::Service::MarkMethodStreamed($Idx$,\n" - " new ::grpc::internal::SplitServerStreamingHandler<\n" - " $Request$, $Response$>(\n" - " [this](::grpc::ServerContext* context,\n" - " ::grpc::ServerSplitStreamer<\n" - " $Request$, $Response$>* streamer) {\n" - " return this->Streamed$Method$(context,\n" - " streamer);\n" - " }));\n" - "}\n"); - printer->Print(*vars, - "~WithSplitStreamingMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - printer->Print( - *vars, - "// disable regular version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "::grpc::ServerWriter< $Response$>* /*writer*/) override " - "{\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - printer->Print(*vars, - "// replace default version of method with split streamed\n" - "virtual ::grpc::Status Streamed$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerSplitStreamer< " - "$Request$,$Response$>* server_split_streamer)" - " = 0;\n"); - printer->Outdent(); - printer->Print(*vars, "};\n"); - } -} - -void PrintHeaderServerMethodGeneric(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - printer->Print(*vars, "template \n"); - printer->Print(*vars, - "class WithGenericMethod_$Method$ : public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, - "WithGenericMethod_$Method$() {\n" - " ::grpc::Service::MarkMethodGeneric($Idx$);\n" - "}\n"); - printer->Print(*vars, - "~WithGenericMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - if (params.allow_sync_server_api) { - if (method->NoStreaming()) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReader< $Request$>* /*reader*/, " - "$Response$* /*response*/) override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, const $Request$* /*request*/, " - "::grpc::ServerWriter< $Response$>* /*writer*/) override " - "{\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } else if (method->BidiStreaming()) { - printer->Print( - *vars, - "// disable synchronous version of this method\n" - "::grpc::Status $Method$(" - "::grpc::ServerContext* /*context*/, " - "::grpc::ServerReaderWriter< $Response$, $Request$>* /*stream*/) " - " override {\n" - " abort();\n" - " return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, \"\");\n" - "}\n"); - } - } - printer->Outdent(); - printer->Print(*vars, "};\n"); -} - -void PrintHeaderServerMethodRaw(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - // These will be disabled - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - // These will be used for raw API - (*vars)["RealRequest"] = "::grpc::ByteBuffer"; - (*vars)["RealResponse"] = "::grpc::ByteBuffer"; - printer->Print(*vars, "template \n"); - printer->Print(*vars, "class WithRawMethod_$Method$ : public BaseClass {\n"); - printer->Print( - " private:\n" - " void BaseClassMustBeDerivedFromService(const Service* /*service*/) " - "{}\n"); - printer->Print(" public:\n"); - printer->Indent(); - printer->Print(*vars, - "WithRawMethod_$Method$() {\n" - " ::grpc::Service::MarkMethodRaw($Idx$);\n" - "}\n"); - printer->Print(*vars, - "~WithRawMethod_$Method$() override {\n" - " BaseClassMustBeDerivedFromService(this);\n" - "}\n"); - PrintHeaderServerAsyncMethodsHelper(printer, method, params, vars); - printer->Outdent(); - printer->Print(*vars, "};\n"); -} - -void PrintHeaderService(grpc_generator::Printer* printer, - const grpc_generator::Service* service, - const Parameters& params, - std::map* vars) { - (*vars)["Service"] = service->name(); - - printer->Print(service->GetLeadingComments("//").c_str()); - printer->Print(*vars, - "class $Service$ final {\n" - " public:\n"); - printer->Indent(); - - // Service metadata - printer->Print(*vars, - "static constexpr char const* service_full_name() {\n" - " return \"$Package$$Service$\";\n" - "}\n"); - - // Client side - printer->Print( - "class StubInterface {\n" - " public:\n"); - printer->Indent(); - printer->Print("virtual ~StubInterface() {}\n"); - for (int i = 0; i < service->method_count(); ++i) { - printer->Print(service->method(i)->GetLeadingComments("//").c_str()); - PrintHeaderClientMethodInterfaces(printer, service->method(i).get(), params, - vars, true); - printer->Print(service->method(i)->GetTrailingComments("//").c_str()); - } - PrintHeaderClientMethodCallbackInterfacesStart(printer, vars); - for (int i = 0; i < service->method_count(); ++i) { - printer->Print(service->method(i)->GetLeadingComments("//").c_str()); - PrintHeaderClientMethodCallbackInterfaces(printer, service->method(i).get(), - vars); - printer->Print(service->method(i)->GetTrailingComments("//").c_str()); - } - PrintHeaderClientMethodCallbackInterfacesEnd(printer, vars); - printer->Outdent(); - printer->Print(" private:\n"); - printer->Indent(); - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderClientMethodInterfaces(printer, service->method(i).get(), params, - vars, false); - } - printer->Outdent(); - printer->Print("};\n"); - printer->Print( - "class Stub final : public StubInterface" - " {\n public:\n"); - printer->Indent(); - printer->Print( - "Stub(const std::shared_ptr< ::grpc::ChannelInterface>& " - "channel, const ::grpc::StubOptions& options = " - "::grpc::StubOptions());\n"); - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderClientMethod(printer, service->method(i).get(), params, vars, - true); - } - PrintHeaderClientMethodCallbackStart(printer, vars); - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderClientMethodCallback(printer, service->method(i).get(), vars); - } - PrintHeaderClientMethodCallbackEnd(printer, vars); - printer->Outdent(); - printer->Print("\n private:\n"); - printer->Indent(); - printer->Print("std::shared_ptr< ::grpc::ChannelInterface> channel_;\n"); - printer->Print("class async async_stub_{this};\n"); - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderClientMethod(printer, service->method(i).get(), params, vars, - false); - } - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderClientMethodData(printer, service->method(i).get(), vars); - } - printer->Outdent(); - printer->Print("};\n"); - printer->Print( - "static std::unique_ptr NewStub(const std::shared_ptr< " - "::grpc::ChannelInterface>& channel, " - "const ::grpc::StubOptions& options = ::grpc::StubOptions());\n"); - - printer->Print("\n"); - - // Server side - base - printer->Print( - "class Service : public ::grpc::Service {\n" - " public:\n"); - printer->Indent(); - printer->Print("Service();\n"); - printer->Print("virtual ~Service();\n"); - for (int i = 0; i < service->method_count(); ++i) { - PrintHeaderServerMethodSync(printer, service->method(i).get(), params, - vars); - } - printer->Outdent(); - printer->Print("};\n"); - - if (params.allow_cq_api) { - // Server side - Asynchronous - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodAsync(printer, service->method(i).get(), params, - vars); - } - - printer->Print("typedef "); - - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["method_name"] = service->method(i)->name(); - printer->Print(*vars, "WithAsyncMethod_$method_name$<"); - } - printer->Print("Service"); - for (int i = 0; i < service->method_count(); ++i) { - printer->Print(" >"); - } - printer->Print(" AsyncService;\n"); - } - - // Server side - Callback - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodCallback(printer, service->method(i).get(), params, - vars); - } - - printer->Print("typedef "); - - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["method_name"] = service->method(i)->name(); - printer->Print(*vars, "WithCallbackMethod_$method_name$<"); - } - printer->Print("Service"); - for (int i = 0; i < service->method_count(); ++i) { - printer->Print(" >"); - } - printer->Print(" CallbackService;\n"); - - // TODO: Remove following typedef once all uses of ExperimentalCallbackService - // are migrated to CallbackService - printer->Print("typedef CallbackService ExperimentalCallbackService;\n"); - - // Server side - Generic - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodGeneric(printer, service->method(i).get(), params, - vars); - } - - // Server side - Raw Async - if (params.allow_cq_api) { - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodRaw(printer, service->method(i).get(), params, - vars); - } - } - - // Server side - Raw Callback - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodRawCallback(printer, service->method(i).get(), - params, vars); - } - - if (params.allow_sync_server_api) { - // Server side - Streamed Unary - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodStreamedUnary(printer, service->method(i).get(), - vars); - } - - printer->Print("typedef "); - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["method_name"] = service->method(i)->name(); - if (service->method(i)->NoStreaming()) { - printer->Print(*vars, "WithStreamedUnaryMethod_$method_name$<"); - } - } - printer->Print("Service"); - for (int i = 0; i < service->method_count(); ++i) { - if (service->method(i)->NoStreaming()) { - printer->Print(" >"); - } - } - printer->Print(" StreamedUnaryService;\n"); - - // Server side - controlled server-side streaming - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintHeaderServerMethodSplitStreaming(printer, service->method(i).get(), - vars); - } - - printer->Print("typedef "); - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["method_name"] = service->method(i)->name(); - auto method = service->method(i); - if (ServerOnlyStreaming(method.get())) { - printer->Print(*vars, "WithSplitStreamingMethod_$method_name$<"); - } - } - printer->Print("Service"); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - if (ServerOnlyStreaming(method.get())) { - printer->Print(" >"); - } - } - printer->Print(" SplitStreamedService;\n"); - - // Server side - typedef for controlled both unary and server-side streaming - printer->Print("typedef "); - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["method_name"] = service->method(i)->name(); - auto method = service->method(i); - if (ServerOnlyStreaming(method.get())) { - printer->Print(*vars, "WithSplitStreamingMethod_$method_name$<"); - } - if (service->method(i)->NoStreaming()) { - printer->Print(*vars, "WithStreamedUnaryMethod_$method_name$<"); - } - } - printer->Print("Service"); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - if (service->method(i)->NoStreaming() || - ServerOnlyStreaming(method.get())) { - printer->Print(" >"); - } - } - printer->Print(" StreamedService;\n"); - } - - printer->Outdent(); - printer->Print("};\n"); - printer->Print(service->GetTrailingComments("//").c_str()); -} - -std::string GetHeaderServices(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - // Package string is empty or ends with a dot. It is used to fully qualify - // method names. - vars["Package"] = file->package(); - if (!file->package().empty()) { - vars["Package"].append("."); - } - - if (!params.services_namespace.empty()) { - vars["services_namespace"] = params.services_namespace; - printer->Print(vars, "\nnamespace $services_namespace$ {\n\n"); - } - - for (int i = 0; i < file->service_count(); ++i) { - PrintHeaderService(printer.get(), file->service(i).get(), params, &vars); - printer->Print("\n"); - } - - if (!params.services_namespace.empty()) { - printer->Print(vars, "} // namespace $services_namespace$\n\n"); - } - } - return output; -} - -std::string GetHeaderEpilogue(grpc_generator::File* file, - const Parameters& /*params*/) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - vars["filename"] = file->filename(); - vars["filename_identifier"] = FilenameIdentifier(file->filename()); - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - - for (auto part = parts.rbegin(); part != parts.rend(); part++) { - vars["part"] = *part; - printer->Print(vars, "} // namespace $part$\n"); - } - printer->Print(vars, "\n"); - } - - printer->Print(vars, "\n"); - printer->Print(vars, "#endif // GRPC_$filename_identifier$__INCLUDED\n"); - - printer->Print(file->GetTrailingComments("//").c_str()); - } - return output; -} - -std::string GetSourcePrologue(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - vars["filename"] = file->filename(); - vars["filename_base"] = file->filename_without_ext(); - vars["message_header_ext"] = params.message_header_extension.empty() - ? kCppGeneratorMessageHeaderExt - : params.message_header_extension; - vars["service_header_ext"] = kCppGeneratorServiceHeaderExt; - - printer->Print(vars, "// Generated by the gRPC C++ plugin.\n"); - printer->Print(vars, - "// If you make any local change, they will be lost.\n"); - printer->Print(vars, "// source: $filename$\n\n"); - - printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n"); - printer->Print(vars, "#include \"$filename_base$$service_header_ext$\"\n"); - printer->Print(vars, "\n"); - } - return output; -} - -std::string GetSourceIncludes(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - static const char* headers_strs[] = { - "functional", - "grpcpp/support/async_stream.h", - "grpcpp/support/async_unary_call.h", - "grpcpp/impl/channel_interface.h", - "grpcpp/impl/client_unary_call.h", - "grpcpp/support/client_callback.h", - "grpcpp/support/message_allocator.h", - "grpcpp/support/method_handler.h", - "grpcpp/impl/rpc_service_method.h", - "grpcpp/support/server_callback.h", - "grpcpp/impl/server_callback_handlers.h", - "grpcpp/server_context.h", - "grpcpp/impl/service_type.h", - "grpcpp/support/sync_stream.h"}; - std::vector headers(headers_strs, array_end(headers_strs)); - PrintIncludes(printer.get(), headers, params.use_system_headers, - params.grpc_search_path); - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - - for (auto part = parts.begin(); part != parts.end(); part++) { - vars["part"] = *part; - printer->Print(vars, "namespace $part$ {\n"); - } - } - - printer->Print(vars, "\n"); - } - return output; -} - -void PrintSourceClientMethod(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - struct { - std::string prefix; - std::string start; // bool literal expressed as string - std::string method_params; // extra arguments to method - std::string create_args; // extra arguments to creator - } async_prefixes[] = {{"Async", "true", ", void* tag", ", tag"}, - {"PrepareAsync", "false", "", ", nullptr"}}; - if (method->NoStreaming()) { - printer->Print(*vars, - "::grpc::Status $ns$$Service$::Stub::$Method$(" - "::grpc::ClientContext* context, " - "const $Request$& request, $Response$* response) {\n"); - printer->Print(*vars, - " return ::grpc::internal::BlockingUnaryCall" - "< $Request$, $Response$, ::grpc::protobuf::MessageLite, " - "::grpc::protobuf::MessageLite>" - "(channel_.get(), rpcmethod_$Method$_, " - "context, request, response);\n}\n\n"); - - printer->Print(*vars, - "void $ns$$Service$::Stub::async::$Method$(" - "::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "std::function f) {\n"); - printer->Print(*vars, - " ::grpc::internal::CallbackUnaryCall" - "< $Request$, $Response$, ::grpc::protobuf::MessageLite, " - "::grpc::protobuf::MessageLite>" - "(stub_->channel_.get(), stub_->rpcmethod_$Method$_, " - "context, request, response, std::move(f));\n}\n\n"); - - printer->Print(*vars, - "void $ns$$Service$::Stub::async::$Method$(" - "::grpc::ClientContext* context, " - "const $Request$* request, $Response$* response, " - "::grpc::ClientUnaryReactor* reactor) {\n"); - printer->Print(*vars, - " ::grpc::internal::ClientCallbackUnaryFactory::Create" - "< ::grpc::protobuf::MessageLite, " - "::grpc::protobuf::MessageLite>" - "(stub_->channel_.get(), stub_->rpcmethod_$Method$_, " - "context, request, response, reactor);\n}\n\n"); - - if (params.allow_cq_api) { - printer->Print(*vars, - "::grpc::ClientAsyncResponseReader< $Response$>* " - "$ns$$Service$::Stub::PrepareAsync$Method$Raw(::grpc::" - "ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) {\n"); - printer->Print(*vars, - " return " - "::grpc::internal::ClientAsyncResponseReaderHelper::Create" - "< $Response$, $Request$, ::grpc::protobuf::MessageLite, " - "::grpc::protobuf::MessageLite>" - "(channel_.get(), cq, rpcmethod_$Method$_, " - "context, request);\n" - "}\n\n"); - printer->Print(*vars, - "::grpc::ClientAsyncResponseReader< $Response$>* " - "$ns$$Service$::Stub::Async$Method$Raw(::grpc::" - "ClientContext* context, " - "const $Request$& request, " - "::grpc::CompletionQueue* cq) {\n"); - printer->Print( - *vars, - " auto* result =\n" - " this->PrepareAsync$Method$Raw(context, request, cq);\n" - " result->StartCall();\n" - " return result;\n" - "}\n\n"); - } - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::ClientWriter< $Request$>* " - "$ns$$Service$::Stub::$Method$Raw(" - "::grpc::ClientContext* context, $Response$* response) {\n"); - printer->Print(*vars, - " return ::grpc::internal::ClientWriterFactory< " - "$Request$>::Create(" - "channel_.get(), " - "rpcmethod_$Method$_, " - "context, response);\n" - "}\n\n"); - - printer->Print(*vars, - "void $ns$$Service$::" - "Stub::async::$Method$(::grpc::ClientContext* context, " - "$Response$* response, " - "::grpc::ClientWriteReactor< $Request$>* reactor) {\n"); - printer->Print(*vars, - " ::grpc::internal::ClientCallbackWriterFactory< " - "$Request$>::Create(" - "stub_->channel_.get(), " - "stub_->rpcmethod_$Method$_, " - "context, response, reactor);\n" - "}\n\n"); - - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncStart"] = async_prefix.start; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncCreateArgs"] = async_prefix.create_args; - printer->Print(*vars, - "::grpc::ClientAsyncWriter< $Request$>* " - "$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw(" - "::grpc::ClientContext* context, $Response$* response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Print( - *vars, - " return ::grpc::internal::ClientAsyncWriterFactory< $Request$>" - "::Create(channel_.get(), cq, " - "rpcmethod_$Method$_, " - "context, response, $AsyncStart$$AsyncCreateArgs$);\n" - "}\n\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "::grpc::ClientReader< $Response$>* " - "$ns$$Service$::Stub::$Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request) {\n"); - printer->Print(*vars, - " return ::grpc::internal::ClientReaderFactory< " - "$Response$>::Create(" - "channel_.get(), " - "rpcmethod_$Method$_, " - "context, request);\n" - "}\n\n"); - - printer->Print(*vars, - "void $ns$$Service$::Stub::async::$Method$(::grpc::" - "ClientContext* context, " - "const $Request$* request, " - "::grpc::ClientReadReactor< $Response$>* reactor) {\n"); - printer->Print(*vars, - " ::grpc::internal::ClientCallbackReaderFactory< " - "$Response$>::Create(" - "stub_->channel_.get(), " - "stub_->rpcmethod_$Method$_, " - "context, request, reactor);\n" - "}\n\n"); - - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncStart"] = async_prefix.start; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncCreateArgs"] = async_prefix.create_args; - printer->Print( - *vars, - "::grpc::ClientAsyncReader< $Response$>* " - "$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw(" - "::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Print(*vars, - " return ::grpc::internal::ClientAsyncReaderFactory< " - "$Response$>" - "::Create(channel_.get(), cq, " - "rpcmethod_$Method$_, " - "context, request, $AsyncStart$$AsyncCreateArgs$);\n" - "}\n\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print( - *vars, - "::grpc::ClientReaderWriter< $Request$, $Response$>* " - "$ns$$Service$::Stub::$Method$Raw(::grpc::ClientContext* context) {\n"); - printer->Print(*vars, - " return ::grpc::internal::ClientReaderWriterFactory< " - "$Request$, $Response$>::Create(" - "channel_.get(), " - "rpcmethod_$Method$_, " - "context);\n" - "}\n\n"); - - printer->Print(*vars, - "void $ns$$Service$::Stub::async::$Method$(::grpc::" - "ClientContext* context, " - "::grpc::ClientBidiReactor< $Request$,$Response$>* " - "reactor) {\n"); - printer->Print(*vars, - " ::grpc::internal::ClientCallbackReaderWriterFactory< " - "$Request$,$Response$>::Create(" - "stub_->channel_.get(), " - "stub_->rpcmethod_$Method$_, " - "context, reactor);\n" - "}\n\n"); - - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncStart"] = async_prefix.start; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["AsyncCreateArgs"] = async_prefix.create_args; - printer->Print( - *vars, - "::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* " - "$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw(::grpc::" - "ClientContext* context, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n"); - printer->Print(*vars, - " return " - "::grpc::internal::ClientAsyncReaderWriterFactory< " - "$Request$, $Response$>::Create(" - "channel_.get(), cq, " - "rpcmethod_$Method$_, " - "context, $AsyncStart$$AsyncCreateArgs$);\n" - "}\n\n"); - } - } - } -} - -void PrintSourceServerMethod(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - if (method->NoStreaming()) { - printer->Print(*vars, - "::grpc::Status $ns$$Service$::Service::$Method$(" - "::grpc::ServerContext* context, " - "const $Request$* request, $Response$* response) {\n"); - if (!params.allow_sync_server_api) { - printer->Print(" abort();\n"); - } - printer->Print(" (void) context;\n"); - printer->Print(" (void) request;\n"); - printer->Print(" (void) response;\n"); - printer->Print( - " return ::grpc::Status(" - "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"); - printer->Print("}\n\n"); - } else if (ClientOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::Status $ns$$Service$::Service::$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerReader< $Request$>* reader, " - "$Response$* response) {\n"); - if (!params.allow_sync_server_api) { - printer->Print(" abort();\n"); - } - printer->Print(" (void) context;\n"); - printer->Print(" (void) reader;\n"); - printer->Print(" (void) response;\n"); - printer->Print( - " return ::grpc::Status(" - "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"); - printer->Print("}\n\n"); - } else if (ServerOnlyStreaming(method)) { - printer->Print(*vars, - "::grpc::Status $ns$$Service$::Service::$Method$(" - "::grpc::ServerContext* context, " - "const $Request$* request, " - "::grpc::ServerWriter< $Response$>* writer) {\n"); - if (!params.allow_sync_server_api) { - printer->Print(" abort();\n"); - } - printer->Print(" (void) context;\n"); - printer->Print(" (void) request;\n"); - printer->Print(" (void) writer;\n"); - printer->Print( - " return ::grpc::Status(" - "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"); - printer->Print("}\n\n"); - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "::grpc::Status $ns$$Service$::Service::$Method$(" - "::grpc::ServerContext* context, " - "::grpc::ServerReaderWriter< $Response$, $Request$>* " - "stream) {\n"); - if (!params.allow_sync_server_api) { - printer->Print(" abort();\n"); - } - printer->Print(" (void) context;\n"); - printer->Print(" (void) stream;\n"); - printer->Print( - " return ::grpc::Status(" - "::grpc::StatusCode::UNIMPLEMENTED, \"\");\n"); - printer->Print("}\n\n"); - } -} - -void PrintSourceService(grpc_generator::Printer* printer, - const grpc_generator::Service* service, - const Parameters& params, - std::map* vars) { - (*vars)["Service"] = service->name(); - - if (service->method_count() > 0) { - printer->Print(*vars, - "static const char* $prefix$$Service$_method_names[] = {\n"); - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Method"] = service->method(i)->name(); - printer->Print(*vars, " \"/$Package$$Service$/$Method$\",\n"); - } - printer->Print(*vars, "};\n\n"); - } - - printer->Print(*vars, - "std::unique_ptr< $ns$$Service$::Stub> $ns$$Service$::NewStub(" - "const std::shared_ptr< ::grpc::ChannelInterface>& channel, " - "const ::grpc::StubOptions& options) {\n" - " (void)options;\n" - " std::unique_ptr< $ns$$Service$::Stub> stub(new " - "$ns$$Service$::Stub(channel, options));\n" - " return stub;\n" - "}\n\n"); - printer->Print(*vars, - "$ns$$Service$::Stub::Stub(const std::shared_ptr< " - "::grpc::ChannelInterface>& channel, const " - "::grpc::StubOptions& options)\n"); - printer->Indent(); - printer->Print(": channel_(channel)"); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - (*vars)["Method"] = method->name(); - (*vars)["Idx"] = as_string(i); - if (method->NoStreaming()) { - (*vars)["StreamingType"] = "NORMAL_RPC"; - // NOTE: There is no reason to consider streamed-unary as a separate - // category here since this part is setting up the client-side stub - // and this appears as a NORMAL_RPC from the client-side. - } else if (ClientOnlyStreaming(method.get())) { - (*vars)["StreamingType"] = "CLIENT_STREAMING"; - } else if (ServerOnlyStreaming(method.get())) { - (*vars)["StreamingType"] = "SERVER_STREAMING"; - } else { - (*vars)["StreamingType"] = "BIDI_STREAMING"; - } - printer->Print( - *vars, - ", rpcmethod_$Method$_(" - "$prefix$$Service$_method_names[$Idx$], options.suffix_for_stats()," - "::grpc::internal::RpcMethod::$StreamingType$, " - "channel" - ")\n"); - } - printer->Print("{}\n\n"); - printer->Outdent(); - - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintSourceClientMethod(printer, service->method(i).get(), params, vars); - } - - printer->Print(*vars, "$ns$$Service$::Service::Service() {\n"); - printer->Indent(); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - (*vars)["Idx"] = as_string(i); - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - if (method->NoStreaming()) { - printer->Print( - *vars, - "AddMethod(new ::grpc::internal::RpcServiceMethod(\n" - " $prefix$$Service$_method_names[$Idx$],\n" - " ::grpc::internal::RpcMethod::NORMAL_RPC,\n" - " new ::grpc::internal::RpcMethodHandler< $ns$$Service$::Service, " - "$Request$, $Response$, ::grpc::protobuf::MessageLite, " - "::grpc::protobuf::MessageLite>(\n" - " []($ns$$Service$::Service* service,\n" - " ::grpc::ServerContext* ctx,\n" - " const $Request$* req,\n" - " $Response$* resp) {\n" - " return service->$Method$(ctx, req, resp);\n" - " }, this)));\n"); - } else if (ClientOnlyStreaming(method.get())) { - printer->Print( - *vars, - "AddMethod(new ::grpc::internal::RpcServiceMethod(\n" - " $prefix$$Service$_method_names[$Idx$],\n" - " ::grpc::internal::RpcMethod::CLIENT_STREAMING,\n" - " new ::grpc::internal::ClientStreamingHandler< " - "$ns$$Service$::Service, $Request$, $Response$>(\n" - " []($ns$$Service$::Service* service,\n" - " ::grpc::ServerContext* ctx,\n" - " ::grpc::ServerReader<$Request$>* reader,\n" - " $Response$* resp) {\n" - " return service->$Method$(ctx, reader, resp);\n" - " }, this)));\n"); - } else if (ServerOnlyStreaming(method.get())) { - printer->Print( - *vars, - "AddMethod(new ::grpc::internal::RpcServiceMethod(\n" - " $prefix$$Service$_method_names[$Idx$],\n" - " ::grpc::internal::RpcMethod::SERVER_STREAMING,\n" - " new ::grpc::internal::ServerStreamingHandler< " - "$ns$$Service$::Service, $Request$, $Response$>(\n" - " []($ns$$Service$::Service* service,\n" - " ::grpc::ServerContext* ctx,\n" - " const $Request$* req,\n" - " ::grpc::ServerWriter<$Response$>* writer) {\n" - " return service->$Method$(ctx, req, writer);\n" - " }, this)));\n"); - } else if (method->BidiStreaming()) { - printer->Print(*vars, - "AddMethod(new ::grpc::internal::RpcServiceMethod(\n" - " $prefix$$Service$_method_names[$Idx$],\n" - " ::grpc::internal::RpcMethod::BIDI_STREAMING,\n" - " new ::grpc::internal::BidiStreamingHandler< " - "$ns$$Service$::Service, $Request$, $Response$>(\n" - " []($ns$$Service$::Service* service,\n" - " ::grpc::ServerContext* ctx,\n" - " ::grpc::ServerReaderWriter<$Response$,\n" - " $Request$>* stream) {\n" - " return service->$Method$(ctx, stream);\n" - " }, this)));\n"); - } - } - printer->Outdent(); - printer->Print(*vars, "}\n\n"); - printer->Print(*vars, - "$ns$$Service$::Service::~Service() {\n" - "}\n\n"); - for (int i = 0; i < service->method_count(); ++i) { - (*vars)["Idx"] = as_string(i); - PrintSourceServerMethod(printer, service->method(i).get(), params, vars); - } -} - -std::string GetSourceServices(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - // Package string is empty or ends with a dot. It is used to fully qualify - // method names. - vars["Package"] = file->package(); - if (!file->package().empty()) { - vars["Package"].append("."); - } - if (!params.services_namespace.empty()) { - vars["ns"] = params.services_namespace + "::"; - vars["prefix"] = params.services_namespace; - } else { - vars["ns"] = ""; - vars["prefix"] = ""; - } - - for (int i = 0; i < file->service_count(); ++i) { - PrintSourceService(printer.get(), file->service(i).get(), params, &vars); - printer->Print("\n"); - } - } - return output; -} - -std::string GetSourceEpilogue(grpc_generator::File* file, - const Parameters& /*params*/) { - std::string temp; - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - - for (auto part = parts.begin(); part != parts.end(); part++) { - temp.append("} // namespace "); - temp.append(*part); - temp.append("\n"); - } - temp.append("\n"); - } - - return temp; -} - -// TODO(mmukhi): Make sure we need parameters or not. -std::string GetMockPrologue(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - vars["filename"] = file->filename(); - vars["filename_identifier"] = FilenameIdentifier(file->filename()); - vars["filename_base"] = file->filename_without_ext(); - vars["message_header_ext"] = params.message_header_extension.empty() - ? kCppGeneratorMessageHeaderExt - : params.message_header_extension; - vars["service_header_ext"] = kCppGeneratorServiceHeaderExt; - - printer->Print(vars, "// Generated by the gRPC C++ plugin.\n"); - printer->Print(vars, - "// If you make any local change, they will be lost.\n"); - printer->Print(vars, "// source: $filename$\n\n"); - - printer->Print(vars, "#ifndef GRPC_MOCK_$filename_identifier$__INCLUDED\n"); - printer->Print(vars, "#define GRPC_MOCK_$filename_identifier$__INCLUDED\n"); - printer->Print(vars, "\n"); - printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n"); - printer->Print(vars, "#include \"$filename_base$$service_header_ext$\"\n"); - if (params.include_import_headers) { - const std::vector import_names = file->GetImportNames(); - for (const auto& import_name : import_names) { - const std::string include_name = ImportInludeFromProtoName(import_name); - printer->Print(vars, include_name.c_str()); - } - printer->PrintRaw("\n"); - } - printer->Print(vars, file->additional_headers().c_str()); - printer->Print(vars, "\n"); - } - return output; -} - -// TODO(mmukhi): Add client-stream and completion-queue headers. -std::string GetMockIncludes(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - - static const char* headers_strs[] = { - "grpcpp/support/async_stream.h", - "grpcpp/support/sync_stream.h", - }; - std::vector headers(headers_strs, array_end(headers_strs)); - PrintIncludes(printer.get(), headers, params.use_system_headers, - params.grpc_search_path); - - std::vector gmock_header; - if (params.gmock_search_path.empty()) { - gmock_header.push_back("gmock/gmock.h"); - PrintIncludes(printer.get(), gmock_header, params.use_system_headers, - params.grpc_search_path); - } else { - gmock_header.push_back("gmock.h"); - // We use local includes when a gmock_search_path is given - PrintIncludes(printer.get(), gmock_header, false, - params.gmock_search_path); - } - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - - for (auto part = parts.begin(); part != parts.end(); part++) { - vars["part"] = *part; - printer->Print(vars, "namespace $part$ {\n"); - } - } - - printer->Print(vars, "\n"); - } - return output; -} - -void PrintMockClientMethods(grpc_generator::Printer* printer, - const grpc_generator::Method* method, - const Parameters& params, - std::map* vars) { - (*vars)["Method"] = method->name(); - (*vars)["Request"] = method->input_type_name(); - (*vars)["Response"] = method->output_type_name(); - - struct { - std::string prefix; - std::string method_params; // extra arguments to method - int extra_method_param_count; - } async_prefixes[] = {{"Async", ", void* tag", 1}, {"PrepareAsync", "", 0}}; - - if (method->NoStreaming()) { - printer->Print( - *vars, - "MOCK_METHOD3($Method$, ::grpc::Status(::grpc::ClientContext* context, " - "const $Request$& request, $Response$* response));\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - printer->Print( - *vars, - "MOCK_METHOD3($AsyncPrefix$$Method$Raw, " - "::grpc::ClientAsyncResponseReaderInterface< $Response$>*" - "(::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq));\n"); - } - } - } else if (ClientOnlyStreaming(method)) { - printer->Print( - *vars, - "MOCK_METHOD2($Method$Raw, " - "::grpc::ClientWriterInterface< $Request$>*" - "(::grpc::ClientContext* context, $Response$* response));\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["MockArgs"] = - std::to_string(3 + async_prefix.extra_method_param_count); - printer->Print(*vars, - "MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, " - "::grpc::ClientAsyncWriterInterface< $Request$>*" - "(::grpc::ClientContext* context, $Response$* response, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$));\n"); - } - } - } else if (ServerOnlyStreaming(method)) { - printer->Print( - *vars, - "MOCK_METHOD2($Method$Raw, " - "::grpc::ClientReaderInterface< $Response$>*" - "(::grpc::ClientContext* context, const $Request$& request));\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["MockArgs"] = - std::to_string(3 + async_prefix.extra_method_param_count); - printer->Print( - *vars, - "MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, " - "::grpc::ClientAsyncReaderInterface< $Response$>*" - "(::grpc::ClientContext* context, const $Request$& request, " - "::grpc::CompletionQueue* cq$AsyncMethodParams$));\n"); - } - } - } else if (method->BidiStreaming()) { - printer->Print( - *vars, - "MOCK_METHOD1($Method$Raw, " - "::grpc::ClientReaderWriterInterface< $Request$, $Response$>*" - "(::grpc::ClientContext* context));\n"); - if (params.allow_cq_api) { - for (const auto& async_prefix : async_prefixes) { - (*vars)["AsyncPrefix"] = async_prefix.prefix; - (*vars)["AsyncMethodParams"] = async_prefix.method_params; - (*vars)["MockArgs"] = - std::to_string(2 + async_prefix.extra_method_param_count); - printer->Print( - *vars, - "MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, " - "::grpc::ClientAsyncReaderWriterInterface<$Request$, " - "$Response$>*" - "(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq" - "$AsyncMethodParams$));\n"); - } - } - } -} - -void PrintMockService(grpc_generator::Printer* printer, - const grpc_generator::Service* service, - const Parameters& params, - std::map* vars) { - (*vars)["Service"] = service->name(); - - printer->Print(*vars, - "class Mock$Service$Stub : public $Service$::StubInterface {\n" - " public:\n"); - printer->Indent(); - for (int i = 0; i < service->method_count(); ++i) { - PrintMockClientMethods(printer, service->method(i).get(), params, vars); - } - printer->Outdent(); - printer->Print("};\n"); -} - -std::string GetMockServices(grpc_generator::File* file, - const Parameters& params) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - // Package string is empty or ends with a dot. It is used to fully qualify - // method names. - vars["Package"] = file->package(); - if (!file->package().empty()) { - vars["Package"].append("."); - } - - if (!params.services_namespace.empty()) { - vars["services_namespace"] = params.services_namespace; - printer->Print(vars, "\nnamespace $services_namespace$ {\n\n"); - } - - for (int i = 0; i < file->service_count(); i++) { - PrintMockService(printer.get(), file->service(i).get(), params, &vars); - printer->Print("\n"); - } - - if (!params.services_namespace.empty()) { - printer->Print(vars, "} // namespace $services_namespace$\n\n"); - } - } - return output; -} - -std::string GetMockEpilogue(grpc_generator::File* file, - const Parameters& /*params*/) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto printer = file->CreatePrinter(&output); - std::map vars; - vars["filename_identifier"] = FilenameIdentifier(file->filename()); - - if (!file->package().empty()) { - std::vector parts = file->package_parts(); - for (auto part = parts.rbegin(); part != parts.rend(); part++) { - vars["part"] = *part; - printer->Print(vars, "} // namespace $part$\n"); - } - printer->Print(vars, "\n"); - } - - printer->Print(vars, "\n"); - printer->Print(vars, - "#endif // GRPC_MOCK_$filename_identifier$__INCLUDED\n"); - } - return output; -} - -} // namespace grpc_cpp_generator diff --git a/deps/grpc/src/compiler/cpp_generator.h b/deps/grpc/src/compiler/cpp_generator.h deleted file mode 100644 index 14e8f129af..0000000000 --- a/deps/grpc/src/compiler/cpp_generator.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H - -// cpp_generator.h/.cc do not directly depend on GRPC/ProtoBuf, such that they -// can be used to generate code for other serialization systems, such as -// FlatBuffers. - -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/schema_interface.h" - -#ifdef GRPC_CUSTOM_STRING -#warning GRPC_CUSTOM_STRING is no longer supported. Please use std::string. -#endif - -namespace grpc { - -// Using grpc::string and grpc::to_string is discouraged in favor of -// std::string and std::to_string. This is only for legacy code using -// them explictly. -using std::string; // deprecated -using std::to_string; // deprecated - -} // namespace grpc - -namespace grpc_cpp_generator { - -// Contains all the parameters that are parsed from the command line. -struct Parameters { - // Puts the service into a namespace - std::string services_namespace; - // Use system includes (<>) or local includes ("") - bool use_system_headers; - // Prefix to any grpc include - std::string grpc_search_path; - // Generate Google Mock code to facilitate unit testing. - bool generate_mock_code; - // Google Mock search path, when non-empty, local includes will be used. - std::string gmock_search_path; - // *EXPERIMENTAL* Additional include files in grpc.pb.h - std::vector additional_header_includes; - // By default, use "pb.h" - std::string message_header_extension; - // Whether to include headers corresponding to imports in source file. - bool include_import_headers; - // Whether to expose synchronous server API. - bool allow_sync_server_api; - // Whether to generate completion queue API. - bool allow_cq_api; -}; - -// Return the prologue of the generated header file. -std::string GetHeaderPrologue(grpc_generator::File* file, - const Parameters& params); - -// Return the includes needed for generated header file. -std::string GetHeaderIncludes(grpc_generator::File* file, - const Parameters& params); - -// Return the includes needed for generated source file. -std::string GetSourceIncludes(grpc_generator::File* file, - const Parameters& params); - -// Return the epilogue of the generated header file. -std::string GetHeaderEpilogue(grpc_generator::File* file, - const Parameters& params); - -// Return the prologue of the generated source file. -std::string GetSourcePrologue(grpc_generator::File* file, - const Parameters& params); - -// Return the services for generated header file. -std::string GetHeaderServices(grpc_generator::File* file, - const Parameters& params); - -// Return the services for generated source file. -std::string GetSourceServices(grpc_generator::File* file, - const Parameters& params); - -// Return the epilogue of the generated source file. -std::string GetSourceEpilogue(grpc_generator::File* file, - const Parameters& params); - -// Return the prologue of the generated mock file. -std::string GetMockPrologue(grpc_generator::File* file, - const Parameters& params); - -// Return the includes needed for generated mock file. -std::string GetMockIncludes(grpc_generator::File* file, - const Parameters& params); - -// Return the services for generated mock file. -std::string GetMockServices(grpc_generator::File* file, - const Parameters& params); - -// Return the epilogue of generated mock file. -std::string GetMockEpilogue(grpc_generator::File* file, - const Parameters& params); - -// Return the prologue of the generated mock file. -std::string GetMockPrologue(grpc_generator::File* file, - const Parameters& params); - -// Return the includes needed for generated mock file. -std::string GetMockIncludes(grpc_generator::File* file, - const Parameters& params); - -// Return the services for generated mock file. -std::string GetMockServices(grpc_generator::File* file, - const Parameters& params); - -// Return the epilogue of generated mock file. -std::string GetMockEpilogue(grpc_generator::File* file, - const Parameters& params); - -} // namespace grpc_cpp_generator - -#endif // GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H diff --git a/deps/grpc/src/compiler/cpp_generator_helpers.h b/deps/grpc/src/compiler/cpp_generator_helpers.h deleted file mode 100644 index 28592ec878..0000000000 --- a/deps/grpc/src/compiler/cpp_generator_helpers.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_CPP_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_CPP_GENERATOR_HELPERS_H - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" - -namespace grpc_cpp_generator { - -inline std::string DotsToColons(const std::string& name) { - return grpc_generator::StringReplace(name, ".", "::"); -} - -inline std::string DotsToUnderscores(const std::string& name) { - return grpc_generator::StringReplace(name, ".", "_"); -} - -inline std::string ClassName(const grpc::protobuf::Descriptor* descriptor, - bool qualified) { - // Find "outer", the descriptor of the top-level message in which - // "descriptor" is embedded. - const grpc::protobuf::Descriptor* outer = descriptor; - while (outer->containing_type() != NULL) outer = outer->containing_type(); - - const std::string& outer_name = outer->full_name(); - std::string inner_name = descriptor->full_name().substr(outer_name.size()); - - if (qualified) { - return "::" + DotsToColons(outer_name) + DotsToUnderscores(inner_name); - } else { - return outer->name() + DotsToUnderscores(inner_name); - } -} - -// Get leading or trailing comments in a string. Comment lines start with "// ". -// Leading detached comments are put in front of leading comments. -template -inline std::string GetCppComments(const DescriptorType* desc, bool leading) { - return grpc_generator::GetPrefixedComments(desc, leading, "//"); -} - -} // namespace grpc_cpp_generator - -#endif // GRPC_INTERNAL_COMPILER_CPP_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/cpp_plugin.cc b/deps/grpc/src/compiler/cpp_plugin.cc deleted file mode 100644 index 2de2745445..0000000000 --- a/deps/grpc/src/compiler/cpp_plugin.cc +++ /dev/null @@ -1,26 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates cpp gRPC service interface out of Protobuf IDL. -// -#include "src/compiler/cpp_plugin.h" - -int main(int argc, char* argv[]) { - CppGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/cpp_plugin.h b/deps/grpc/src/compiler/cpp_plugin.h deleted file mode 100644 index 1e356e9421..0000000000 --- a/deps/grpc/src/compiler/cpp_plugin.h +++ /dev/null @@ -1,189 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_CPP_PLUGIN_H -#define GRPC_INTERNAL_COMPILER_CPP_PLUGIN_H - -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/cpp_generator.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/protobuf_plugin.h" - -// Cpp Generator for Protobug IDL -class CppGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - CppGrpcGenerator() {} - virtual ~CppGrpcGenerator() {} - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - virtual bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* error) const override { - if (file->options().cc_generic_services()) { - *error = - "cpp grpc proto compiler plugin does not work with generic " - "services. To generate cpp grpc APIs, please set \"" - "cc_generic_service = false\"."; - return false; - } - - grpc_cpp_generator::Parameters generator_parameters; - generator_parameters.use_system_headers = true; - generator_parameters.generate_mock_code = false; - generator_parameters.include_import_headers = false; - generator_parameters.allow_sync_server_api = true; - generator_parameters.allow_cq_api = true; - - ProtoBufFile pbfile(file); - - if (!parameter.empty()) { - std::vector parameters_list = - grpc_generator::tokenize(parameter, ","); - for (auto parameter_string = parameters_list.begin(); - parameter_string != parameters_list.end(); parameter_string++) { - std::vector param = - grpc_generator::tokenize(*parameter_string, "="); - if (param[0] == "services_namespace") { - generator_parameters.services_namespace = param[1]; - } else if (param[0] == "use_system_headers") { - if (param[1] == "true") { - generator_parameters.use_system_headers = true; - } else if (param[1] == "false") { - generator_parameters.use_system_headers = false; - } else { - *error = std::string("Invalid parameter: ") + *parameter_string; - return false; - } - } else if (param[0] == "grpc_search_path") { - generator_parameters.grpc_search_path = param[1]; - } else if (param[0] == "generate_mock_code") { - if (param[1] == "true") { - generator_parameters.generate_mock_code = true; - } else if (param[1] != "false") { - *error = std::string("Invalid parameter: ") + *parameter_string; - return false; - } - } else if (param[0] == "allow_sync_server_api") { - if (param[1] == "true") { - generator_parameters.allow_sync_server_api = true; - } else if (param[1] == "false") { - generator_parameters.allow_sync_server_api = false; - } else { - *error = std::string("Invalid parameter: ") + *parameter_string; - return false; - } - } else if (param[0] == "allow_cq_api") { - if (param[1] == "true") { - generator_parameters.allow_cq_api = true; - } else if (param[1] == "false") { - generator_parameters.allow_cq_api = false; - } else { - *error = std::string("Invalid parameter: ") + *parameter_string; - return false; - } - } else if (param[0] == "gmock_search_path") { - generator_parameters.gmock_search_path = param[1]; - } else if (param[0] == "additional_header_includes") { - generator_parameters.additional_header_includes = - grpc_generator::tokenize(param[1], ":"); - } else if (param[0] == "message_header_extension") { - generator_parameters.message_header_extension = param[1]; - } else if (param[0] == "include_import_headers") { - if (param[1] == "true") { - generator_parameters.include_import_headers = true; - } else if (param[1] != "false") { - *error = std::string("Invalid parameter: ") + *parameter_string; - return false; - } - } else { - *error = std::string("Unknown parameter: ") + *parameter_string; - return false; - } - } - } - - std::string file_name = grpc_generator::StripProto(file->name()); - - std::string header_code = - grpc_cpp_generator::GetHeaderPrologue(&pbfile, generator_parameters) + - grpc_cpp_generator::GetHeaderIncludes(&pbfile, generator_parameters) + - grpc_cpp_generator::GetHeaderServices(&pbfile, generator_parameters) + - grpc_cpp_generator::GetHeaderEpilogue(&pbfile, generator_parameters); - std::unique_ptr header_output( - context->Open(file_name + ".grpc.pb.h")); - grpc::protobuf::io::CodedOutputStream header_coded_out(header_output.get()); - header_coded_out.WriteRaw(header_code.data(), header_code.size()); - - std::string source_code = - grpc_cpp_generator::GetSourcePrologue(&pbfile, generator_parameters) + - grpc_cpp_generator::GetSourceIncludes(&pbfile, generator_parameters) + - grpc_cpp_generator::GetSourceServices(&pbfile, generator_parameters) + - grpc_cpp_generator::GetSourceEpilogue(&pbfile, generator_parameters); - std::unique_ptr source_output( - context->Open(file_name + ".grpc.pb.cc")); - grpc::protobuf::io::CodedOutputStream source_coded_out(source_output.get()); - source_coded_out.WriteRaw(source_code.data(), source_code.size()); - - if (!generator_parameters.generate_mock_code) { - return true; - } - std::string mock_code = - grpc_cpp_generator::GetMockPrologue(&pbfile, generator_parameters) + - grpc_cpp_generator::GetMockIncludes(&pbfile, generator_parameters) + - grpc_cpp_generator::GetMockServices(&pbfile, generator_parameters) + - grpc_cpp_generator::GetMockEpilogue(&pbfile, generator_parameters); - std::unique_ptr mock_output( - context->Open(file_name + "_mock.grpc.pb.h")); - grpc::protobuf::io::CodedOutputStream mock_coded_out(mock_output.get()); - mock_coded_out.WriteRaw(mock_code.data(), mock_code.size()); - - return true; - } - - private: - // Insert the given code into the given file at the given insertion point. - void Insert(grpc::protobuf::compiler::GeneratorContext* context, - const std::string& filename, const std::string& insertion_point, - const std::string& code) const { - std::unique_ptr output( - context->OpenForInsert(filename, insertion_point)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - } -}; - -#endif // GRPC_INTERNAL_COMPILER_CPP_PLUGIN_H diff --git a/deps/grpc/src/compiler/csharp_generator.cc b/deps/grpc/src/compiler/csharp_generator.cc deleted file mode 100644 index 3df1fb2110..0000000000 --- a/deps/grpc/src/compiler/csharp_generator.cc +++ /dev/null @@ -1,852 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/csharp_generator.h" - -#include -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/csharp_generator_helpers.h" - -using grpc::protobuf::Descriptor; -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::MethodDescriptor; -using grpc::protobuf::ServiceDescriptor; -using grpc::protobuf::io::Printer; -using grpc::protobuf::io::StringOutputStream; -using grpc_generator::StringReplace; -using std::vector; - -namespace grpc_csharp_generator { -namespace { - -// This function is a massaged version of -// https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc -// Currently, we cannot easily reuse the functionality as -// google/protobuf/compiler/csharp/csharp_doc_comment.h is not a public header. -// TODO(jtattermusch): reuse the functionality from google/protobuf. -bool GenerateDocCommentBodyImpl(grpc::protobuf::io::Printer* printer, - grpc::protobuf::SourceLocation location) { - std::string comments = location.leading_comments.empty() - ? location.trailing_comments - : location.leading_comments; - if (comments.empty()) { - return false; - } - // XML escaping... no need for apostrophes etc as the whole text is going to - // be a child - // node of a summary element, not part of an attribute. - comments = grpc_generator::StringReplace(comments, "&", "&", true); - comments = grpc_generator::StringReplace(comments, "<", "<", true); - - std::vector lines; - grpc_generator::Split(comments, '\n', &lines); - // TODO: We really should work out which part to put in the summary and which - // to put in the remarks... - // but that needs to be part of a bigger effort to understand the markdown - // better anyway. - printer->Print("/// \n"); - bool last_was_empty = false; - // We squash multiple blank lines down to one, and remove any trailing blank - // lines. We need - // to preserve the blank lines themselves, as this is relevant in the - // markdown. - // Note that we can't remove leading or trailing whitespace as *that's* - // relevant in markdown too. - // (We don't skip "just whitespace" lines, either.) - for (std::vector::iterator it = lines.begin(); it != lines.end(); - ++it) { - std::string line = *it; - if (line.empty()) { - last_was_empty = true; - } else { - if (last_was_empty) { - printer->Print("///\n"); - } - last_was_empty = false; - // If the comment has an extra slash at the start then this can cause the - // C# compiler to complain when generating the XML documentation Issue - // [https://github.com/grpc/grpc/issues/35905](https://www.google.com/url?q=https://github.com/grpc/grpc/issues/35905&sa=D) - if (line[0] == '/') { - line.replace(0, 1, "/"); - } - printer->Print("///$line$\n", "line", line); - } - } - printer->Print("/// \n"); - return true; -} - -void GenerateGeneratedCodeAttribute(grpc::protobuf::io::Printer* printer) { - // Mark the code as generated using the [GeneratedCode] attribute. - // We don't provide plugin version info in attribute the because: - // * the version information is not readily available from the plugin's code. - // * it would cause a lot of churn in the pre-generated code - // in this repository every time the version is updated. - printer->Print( - "[global::System.CodeDom.Compiler.GeneratedCode(\"grpc_csharp_plugin\", " - "null)]\n"); -} - -void GenerateObsoleteAttribute(grpc::protobuf::io::Printer* printer, - bool is_deprecated) { - // Mark the code deprecated using the [ObsoleteAttribute] attribute. - if (is_deprecated) { - printer->Print("[global::System.ObsoleteAttribute]\n"); - } -} - -template -bool GenerateDocCommentBody(grpc::protobuf::io::Printer* printer, - const DescriptorType* descriptor) { - grpc::protobuf::SourceLocation location; - if (!descriptor->GetSourceLocation(&location)) { - return false; - } - return GenerateDocCommentBodyImpl(printer, location); -} - -void GenerateDocCommentServerMethod(grpc::protobuf::io::Printer* printer, - const MethodDescriptor* method) { - if (GenerateDocCommentBody(printer, method)) { - if (method->client_streaming()) { - printer->Print( - "/// Used for reading requests from " - "the client.\n"); - } else { - printer->Print( - "/// The request received from the " - "client.\n"); - } - if (method->server_streaming()) { - printer->Print( - "/// Used for sending responses back " - "to the client.\n"); - } - printer->Print( - "/// The context of the server-side call " - "handler being invoked.\n"); - if (method->server_streaming()) { - printer->Print( - "/// A task indicating completion of the " - "handler.\n"); - } else { - printer->Print( - "/// The response to send back to the client (wrapped by a " - "task).\n"); - } - } -} - -void GenerateDocCommentClientMethod(grpc::protobuf::io::Printer* printer, - const MethodDescriptor* method, - bool is_sync, bool use_call_options) { - if (GenerateDocCommentBody(printer, method)) { - if (!method->client_streaming()) { - printer->Print( - "/// The request to send to the " - "server.\n"); - } - if (!use_call_options) { - printer->Print( - "/// The initial metadata to send with the " - "call. This parameter is optional.\n"); - printer->Print( - "/// An optional deadline for the call. The " - "call will be cancelled if deadline is hit.\n"); - printer->Print( - "/// An optional token for " - "canceling the call.\n"); - } else { - printer->Print( - "/// The options for the call.\n"); - } - if (is_sync) { - printer->Print( - "/// The response received from the server.\n"); - } else { - printer->Print("/// The call object.\n"); - } - } -} - -std::string GetServiceClassName(const ServiceDescriptor* service) { - return service->name(); -} - -std::string GetClientClassName(const ServiceDescriptor* service) { - return service->name() + "Client"; -} - -std::string GetServerClassName(const ServiceDescriptor* service) { - return service->name() + "Base"; -} - -std::string GetCSharpMethodType(const MethodDescriptor* method) { - if (method->client_streaming()) { - if (method->server_streaming()) { - return "grpc::MethodType.DuplexStreaming"; - } else { - return "grpc::MethodType.ClientStreaming"; - } - } else { - if (method->server_streaming()) { - return "grpc::MethodType.ServerStreaming"; - } else { - return "grpc::MethodType.Unary"; - } - } -} - -std::string GetCSharpServerMethodType(const MethodDescriptor* method) { - if (method->client_streaming()) { - if (method->server_streaming()) { - return "grpc::DuplexStreamingServerMethod"; - } else { - return "grpc::ClientStreamingServerMethod"; - } - } else { - if (method->server_streaming()) { - return "grpc::ServerStreamingServerMethod"; - } else { - return "grpc::UnaryServerMethod"; - } - } -} - -std::string GetServiceNameFieldName() { return "__ServiceName"; } - -std::string GetMarshallerFieldName(const Descriptor* message) { - return "__Marshaller_" + - grpc_generator::StringReplace(message->full_name(), ".", "_", true); -} - -std::string GetMethodFieldName(const MethodDescriptor* method) { - return "__Method_" + method->name(); -} - -std::string GetMethodRequestParamMaybe(const MethodDescriptor* method, - bool invocation_param = false) { - if (method->client_streaming()) { - return ""; - } - if (invocation_param) { - return "request, "; - } - return GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + " request, "; -} - -std::string GetAccessLevel(bool internal_access) { - return internal_access ? "internal" : "public"; -} - -std::string GetMethodReturnTypeClient(const MethodDescriptor* method) { - if (method->client_streaming()) { - if (method->server_streaming()) { - return "grpc::AsyncDuplexStreamingCall<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + ", " + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">"; - } else { - return "grpc::AsyncClientStreamingCall<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + ", " + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">"; - } - } else { - if (method->server_streaming()) { - return "grpc::AsyncServerStreamingCall<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">"; - } else { - return "grpc::AsyncUnaryCall<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">"; - } - } -} - -std::string GetMethodRequestParamServer(const MethodDescriptor* method) { - if (method->client_streaming()) { - return "grpc::IAsyncStreamReader<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + - "> requestStream"; - } - return GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + " request"; -} - -std::string GetMethodReturnTypeServer(const MethodDescriptor* method) { - if (method->server_streaming()) { - return "global::System.Threading.Tasks.Task"; - } - return "global::System.Threading.Tasks.Task<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">"; -} - -std::string GetMethodResponseStreamMaybe(const MethodDescriptor* method) { - if (method->server_streaming()) { - return ", grpc::IServerStreamWriter<" + - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + - "> responseStream"; - } - return ""; -} - -// Gets vector of all messages used as input or output types. -std::vector GetUsedMessages( - const ServiceDescriptor* service) { - std::set descriptor_set; - std::vector - result; // vector is to maintain stable ordering - for (int i = 0; i < service->method_count(); i++) { - const MethodDescriptor* method = service->method(i); - if (descriptor_set.find(method->input_type()) == descriptor_set.end()) { - descriptor_set.insert(method->input_type()); - result.push_back(method->input_type()); - } - if (descriptor_set.find(method->output_type()) == descriptor_set.end()) { - descriptor_set.insert(method->output_type()); - result.push_back(method->output_type()); - } - } - return result; -} - -void GenerateMarshallerFields(Printer* out, const ServiceDescriptor* service) { - std::vector used_messages = GetUsedMessages(service); - if (used_messages.size() != 0) { - // Generate static helper methods for serialization/deserialization - GenerateGeneratedCodeAttribute(out); - out->Print( - "static void __Helper_SerializeMessage(" - "global::Google.Protobuf.IMessage message, " - "grpc::SerializationContext context)\n" - "{\n"); - out->Indent(); - out->Print( - "#if !GRPC_DISABLE_PROTOBUF_BUFFER_SERIALIZATION\n" - "if (message is global::Google.Protobuf.IBufferMessage)\n" - "{\n"); - out->Indent(); - out->Print( - "context.SetPayloadLength(message.CalculateSize());\n" - "global::Google.Protobuf.MessageExtensions.WriteTo(message, " - "context.GetBufferWriter());\n" - "context.Complete();\n" - "return;\n"); - out->Outdent(); - out->Print( - "}\n" - "#endif\n"); - out->Print( - "context.Complete(" - "global::Google.Protobuf.MessageExtensions.ToByteArray(message));\n"); - out->Outdent(); - out->Print("}\n\n"); - - GenerateGeneratedCodeAttribute(out); - out->Print( - "static class __Helper_MessageCache\n" - "{\n"); - out->Indent(); - out->Print( - "public static readonly bool IsBufferMessage = " - "global::System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(" - "global::Google.Protobuf.IBufferMessage)).IsAssignableFrom(typeof(T));" - "\n"); - out->Outdent(); - out->Print("}\n\n"); - - GenerateGeneratedCodeAttribute(out); - out->Print( - "static T __Helper_DeserializeMessage(" - "grpc::DeserializationContext context, " - "global::Google.Protobuf.MessageParser parser) " - "where T : global::Google.Protobuf.IMessage\n" - "{\n"); - out->Indent(); - out->Print( - "#if !GRPC_DISABLE_PROTOBUF_BUFFER_SERIALIZATION\n" - "if (__Helper_MessageCache.IsBufferMessage)\n" - "{\n"); - out->Indent(); - out->Print( - "return parser.ParseFrom(context.PayloadAsReadOnlySequence());\n"); - out->Outdent(); - out->Print( - "}\n" - "#endif\n"); - out->Print("return parser.ParseFrom(context.PayloadAsNewBuffer());\n"); - out->Outdent(); - out->Print("}\n\n"); - } - - for (size_t i = 0; i < used_messages.size(); i++) { - const Descriptor* message = used_messages[i]; - GenerateGeneratedCodeAttribute(out); - out->Print( - "static readonly grpc::Marshaller<$type$> $fieldname$ = " - "grpc::Marshallers.Create(__Helper_SerializeMessage, " - "context => __Helper_DeserializeMessage(context, $type$.Parser));\n", - "fieldname", GetMarshallerFieldName(message), "type", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(message)); - } - out->Print("\n"); -} - -void GenerateStaticMethodField(Printer* out, const MethodDescriptor* method) { - GenerateGeneratedCodeAttribute(out); - out->Print( - "static readonly grpc::Method<$request$, $response$> $fieldname$ = new " - "grpc::Method<$request$, $response$>(\n", - "fieldname", GetMethodFieldName(method), "request", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type())); - out->Indent(); - out->Indent(); - out->Print("$methodtype$,\n", "methodtype", GetCSharpMethodType(method)); - out->Print("$servicenamefield$,\n", "servicenamefield", - GetServiceNameFieldName()); - out->Print("\"$methodname$\",\n", "methodname", method->name()); - out->Print("$requestmarshaller$,\n", "requestmarshaller", - GetMarshallerFieldName(method->input_type())); - out->Print("$responsemarshaller$);\n", "responsemarshaller", - GetMarshallerFieldName(method->output_type())); - out->Print("\n"); - out->Outdent(); - out->Outdent(); -} - -void GenerateServiceDescriptorProperty(Printer* out, - const ServiceDescriptor* service) { - std::ostringstream index; - index << service->index(); - out->Print("/// Service descriptor\n"); - out->Print( - "public static global::Google.Protobuf.Reflection.ServiceDescriptor " - "Descriptor\n"); - out->Print("{\n"); - out->Print(" get { return $umbrella$.Descriptor.Services[$index$]; }\n", - "umbrella", - GRPC_CUSTOM_CSHARP_GETREFLECTIONCLASSNAME(service->file()), - "index", index.str()); - out->Print("}\n"); - out->Print("\n"); -} - -void GenerateServerClass(Printer* out, const ServiceDescriptor* service) { - out->Print( - "/// Base class for server-side implementations of " - "$servicename$\n", - "servicename", GetServiceClassName(service)); - GenerateObsoleteAttribute(out, service->options().deprecated()); - out->Print( - "[grpc::BindServiceMethod(typeof($classname$), " - "\"BindService\")]\n", - "classname", GetServiceClassName(service)); - out->Print("public abstract partial class $name$\n", "name", - GetServerClassName(service)); - out->Print("{\n"); - out->Indent(); - for (int i = 0; i < service->method_count(); i++) { - const MethodDescriptor* method = service->method(i); - GenerateDocCommentServerMethod(out, method); - GenerateObsoleteAttribute(out, method->options().deprecated()); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public virtual $returntype$ " - "$methodname$($request$$response_stream_maybe$, " - "grpc::ServerCallContext context)\n", - "methodname", method->name(), "returntype", - GetMethodReturnTypeServer(method), "request", - GetMethodRequestParamServer(method), "response_stream_maybe", - GetMethodResponseStreamMaybe(method)); - out->Print("{\n"); - out->Indent(); - out->Print( - "throw new grpc::RpcException(" - "new grpc::Status(grpc::StatusCode.Unimplemented, \"\"));\n"); - out->Outdent(); - out->Print("}\n\n"); - } - out->Outdent(); - out->Print("}\n"); - out->Print("\n"); -} - -void GenerateClientStub(Printer* out, const ServiceDescriptor* service) { - out->Print("/// Client for $servicename$\n", "servicename", - GetServiceClassName(service)); - GenerateObsoleteAttribute(out, service->options().deprecated()); - out->Print("public partial class $name$ : grpc::ClientBase<$name$>\n", "name", - GetClientClassName(service)); - out->Print("{\n"); - out->Indent(); - - // constructors - out->Print( - "/// Creates a new client for $servicename$\n" - "/// The channel to use to make remote " - "calls.\n", - "servicename", GetServiceClassName(service)); - GenerateGeneratedCodeAttribute(out); - out->Print("public $name$(grpc::ChannelBase channel) : base(channel)\n", - "name", GetClientClassName(service)); - out->Print("{\n"); - out->Print("}\n"); - out->Print( - "/// Creates a new client for $servicename$ that uses a custom " - "CallInvoker.\n" - "/// The callInvoker to use to make remote " - "calls.\n", - "servicename", GetServiceClassName(service)); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public $name$(grpc::CallInvoker callInvoker) : base(callInvoker)\n", - "name", GetClientClassName(service)); - out->Print("{\n"); - out->Print("}\n"); - out->Print( - "/// Protected parameterless constructor to allow creation" - " of test doubles.\n"); - GenerateGeneratedCodeAttribute(out); - out->Print("protected $name$() : base()\n", "name", - GetClientClassName(service)); - out->Print("{\n"); - out->Print("}\n"); - out->Print( - "/// Protected constructor to allow creation of configured " - "clients.\n" - "/// The client configuration.\n"); - GenerateGeneratedCodeAttribute(out); - out->Print( - "protected $name$(ClientBaseConfiguration configuration)" - " : base(configuration)\n", - "name", GetClientClassName(service)); - out->Print("{\n"); - out->Print("}\n\n"); - - for (int i = 0; i < service->method_count(); i++) { - const MethodDescriptor* method = service->method(i); - const bool is_deprecated = method->options().deprecated(); - if (!method->client_streaming() && !method->server_streaming()) { - // unary calls have an extra synchronous stub method - GenerateDocCommentClientMethod(out, method, true, false); - GenerateObsoleteAttribute(out, is_deprecated); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public virtual $response$ $methodname$($request$ request, " - "grpc::Metadata " - "headers = null, global::System.DateTime? deadline = null, " - "global::System.Threading.CancellationToken " - "cancellationToken = " - "default(global::System.Threading.CancellationToken))\n", - "methodname", method->name(), "request", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type())); - out->Print("{\n"); - out->Indent(); - out->Print( - "return $methodname$(request, new grpc::CallOptions(headers, " - "deadline, " - "cancellationToken));\n", - "methodname", method->name()); - out->Outdent(); - out->Print("}\n"); - - // overload taking CallOptions as a param - GenerateDocCommentClientMethod(out, method, true, true); - GenerateObsoleteAttribute(out, is_deprecated); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public virtual $response$ $methodname$($request$ request, " - "grpc::CallOptions options)\n", - "methodname", method->name(), "request", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type())); - out->Print("{\n"); - out->Indent(); - out->Print( - "return CallInvoker.BlockingUnaryCall($methodfield$, null, options, " - "request);\n", - "methodfield", GetMethodFieldName(method)); - out->Outdent(); - out->Print("}\n"); - } - - std::string method_name = method->name(); - if (!method->client_streaming() && !method->server_streaming()) { - method_name += "Async"; // prevent name clash with synchronous method. - } - GenerateDocCommentClientMethod(out, method, false, false); - GenerateObsoleteAttribute(out, is_deprecated); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public virtual $returntype$ " - "$methodname$($request_maybe$grpc::Metadata " - "headers = null, global::System.DateTime? deadline = null, " - "global::System.Threading.CancellationToken " - "cancellationToken = " - "default(global::System.Threading.CancellationToken))\n", - "methodname", method_name, "request_maybe", - GetMethodRequestParamMaybe(method), "returntype", - GetMethodReturnTypeClient(method)); - out->Print("{\n"); - out->Indent(); - - out->Print( - "return $methodname$($request_maybe$new grpc::CallOptions(headers, " - "deadline, " - "cancellationToken));\n", - "methodname", method_name, "request_maybe", - GetMethodRequestParamMaybe(method, true)); - out->Outdent(); - out->Print("}\n"); - - // overload taking CallOptions as a param - GenerateDocCommentClientMethod(out, method, false, true); - GenerateObsoleteAttribute(out, is_deprecated); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public virtual $returntype$ " - "$methodname$($request_maybe$grpc::CallOptions " - "options)\n", - "methodname", method_name, "request_maybe", - GetMethodRequestParamMaybe(method), "returntype", - GetMethodReturnTypeClient(method)); - out->Print("{\n"); - out->Indent(); - if (!method->client_streaming() && !method->server_streaming()) { - // Non-Streaming - out->Print( - "return CallInvoker.AsyncUnaryCall($methodfield$, null, options, " - "request);\n", - "methodfield", GetMethodFieldName(method)); - } else if (method->client_streaming() && !method->server_streaming()) { - // Client Streaming Only - out->Print( - "return CallInvoker.AsyncClientStreamingCall($methodfield$, null, " - "options);\n", - "methodfield", GetMethodFieldName(method)); - } else if (!method->client_streaming() && method->server_streaming()) { - // Server Streaming Only - out->Print( - "return CallInvoker.AsyncServerStreamingCall($methodfield$, null, " - "options, request);\n", - "methodfield", GetMethodFieldName(method)); - } else { - // Bi-Directional Streaming - out->Print( - "return CallInvoker.AsyncDuplexStreamingCall($methodfield$, null, " - "options);\n", - "methodfield", GetMethodFieldName(method)); - } - out->Outdent(); - out->Print("}\n"); - } - - // override NewInstance method - out->Print( - "/// Creates a new instance of client from given " - "ClientBaseConfiguration.\n"); - GenerateGeneratedCodeAttribute(out); - out->Print( - "protected override $name$ NewInstance(ClientBaseConfiguration " - "configuration)\n", - "name", GetClientClassName(service)); - out->Print("{\n"); - out->Indent(); - out->Print("return new $name$(configuration);\n", "name", - GetClientClassName(service)); - out->Outdent(); - out->Print("}\n"); - - out->Outdent(); - out->Print("}\n"); - out->Print("\n"); -} - -void GenerateBindServiceMethod(Printer* out, const ServiceDescriptor* service) { - out->Print( - "/// Creates service definition that can be registered with a " - "server\n"); - out->Print( - "/// An object implementing the server-side" - " handling logic.\n"); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public static grpc::ServerServiceDefinition BindService($implclass$ " - "serviceImpl)\n", - "implclass", GetServerClassName(service)); - out->Print("{\n"); - out->Indent(); - - out->Print("return grpc::ServerServiceDefinition.CreateBuilder()"); - out->Indent(); - out->Indent(); - for (int i = 0; i < service->method_count(); i++) { - const MethodDescriptor* method = service->method(i); - out->Print("\n.AddMethod($methodfield$, serviceImpl.$methodname$)", - "methodfield", GetMethodFieldName(method), "methodname", - method->name()); - } - out->Print(".Build();\n"); - out->Outdent(); - out->Outdent(); - - out->Outdent(); - out->Print("}\n"); - out->Print("\n"); -} - -void GenerateBindServiceWithBinderMethod(Printer* out, - const ServiceDescriptor* service) { - out->Print( - "/// Register service method with a service " - "binder with or without implementation. Useful when customizing the " - "service binding logic.\n" - "/// Note: this method is part of an experimental API that can change or " - "be " - "removed without any prior notice.\n"); - out->Print( - "/// Service methods will be bound by " - "calling AddMethod on this object." - "\n"); - out->Print( - "/// An object implementing the server-side" - " handling logic.\n"); - GenerateGeneratedCodeAttribute(out); - out->Print( - "public static void BindService(grpc::ServiceBinderBase serviceBinder, " - "$implclass$ " - "serviceImpl)\n", - "implclass", GetServerClassName(service)); - out->Print("{\n"); - out->Indent(); - - for (int i = 0; i < service->method_count(); i++) { - const MethodDescriptor* method = service->method(i); - out->Print( - "serviceBinder.AddMethod($methodfield$, serviceImpl == null ? null : " - "new $servermethodtype$<$inputtype$, $outputtype$>(" - "serviceImpl.$methodname$));\n", - "methodfield", GetMethodFieldName(method), "servermethodtype", - GetCSharpServerMethodType(method), "inputtype", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "outputtype", - GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()), "methodname", - method->name()); - } - - out->Outdent(); - out->Print("}\n"); - out->Print("\n"); -} - -void GenerateService(Printer* out, const ServiceDescriptor* service, - bool generate_client, bool generate_server, - bool internal_access) { - GenerateDocCommentBody(out, service); - - GenerateObsoleteAttribute(out, service->options().deprecated()); - out->Print("$access_level$ static partial class $classname$\n", - "access_level", GetAccessLevel(internal_access), "classname", - GetServiceClassName(service)); - out->Print("{\n"); - out->Indent(); - out->Print("static readonly string $servicenamefield$ = \"$servicename$\";\n", - "servicenamefield", GetServiceNameFieldName(), "servicename", - service->full_name()); - out->Print("\n"); - - GenerateMarshallerFields(out, service); - for (int i = 0; i < service->method_count(); i++) { - GenerateStaticMethodField(out, service->method(i)); - } - GenerateServiceDescriptorProperty(out, service); - - if (generate_server) { - GenerateServerClass(out, service); - } - if (generate_client) { - GenerateClientStub(out, service); - } - if (generate_server) { - GenerateBindServiceMethod(out, service); - GenerateBindServiceWithBinderMethod(out, service); - } - - out->Outdent(); - out->Print("}\n"); -} - -} // anonymous namespace - -std::string GetServices(const FileDescriptor* file, bool generate_client, - bool generate_server, bool internal_access) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - - StringOutputStream output_stream(&output); - Printer out(&output_stream, '$'); - - // Don't write out any output if there no services, to avoid empty service - // files being generated for proto files that don't declare any. - if (file->service_count() == 0) { - return output; - } - - // Write out a file header. - out.Print("// \n"); - out.Print( - "// Generated by the protocol buffer compiler. DO NOT EDIT!\n"); - out.Print("// source: $filename$\n", "filename", file->name()); - out.Print("// \n"); - - // use C++ style as there are no file-level XML comments in .NET - std::string leading_comments = GetCsharpComments(file, true); - if (!leading_comments.empty()) { - out.Print("// Original file comments:\n"); - out.PrintRaw(leading_comments.c_str()); - } - - out.Print("#pragma warning disable 0414, 1591, 8981, 0612\n"); - - out.Print("#region Designer generated code\n"); - out.Print("\n"); - out.Print("using grpc = global::Grpc.Core;\n"); - out.Print("\n"); - - std::string file_namespace = GRPC_CUSTOM_CSHARP_GETFILENAMESPACE(file); - if (file_namespace != "") { - out.Print("namespace $namespace$ {\n", "namespace", file_namespace); - out.Indent(); - } - for (int i = 0; i < file->service_count(); i++) { - GenerateService(&out, file->service(i), generate_client, generate_server, - internal_access); - } - if (file_namespace != "") { - out.Outdent(); - out.Print("}\n"); - } - out.Print("#endregion\n"); - } - return output; -} - -} // namespace grpc_csharp_generator diff --git a/deps/grpc/src/compiler/csharp_generator.h b/deps/grpc/src/compiler/csharp_generator.h deleted file mode 100644 index 494c479958..0000000000 --- a/deps/grpc/src/compiler/csharp_generator.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_H - -#include "src/compiler/config.h" - -namespace grpc_csharp_generator { - -std::string GetServices(const grpc::protobuf::FileDescriptor* file, - bool generate_client, bool generate_server, - bool internal_access); - -} // namespace grpc_csharp_generator - -#endif // GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_H diff --git a/deps/grpc/src/compiler/csharp_generator_helpers.h b/deps/grpc/src/compiler/csharp_generator_helpers.h deleted file mode 100644 index 6d98099342..0000000000 --- a/deps/grpc/src/compiler/csharp_generator_helpers.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_HELPERS_H - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" - -namespace grpc_csharp_generator { - -inline bool ServicesFilename(const grpc::protobuf::FileDescriptor* file, - const std::string& file_suffix, - const bool base_namespace_present, - const std::string& base_namespace, - std::string& out_file, std::string* error) { - // Support for base_namespace option is **experimental**. - // - // If base_namespace is provided then slightly different name mangling - // is used to generate the service file name. This is because this - // uses common code with protoc. For most file names this will not - // make a difference (only files with punctuation or numbers in the - // name.) - // Otherwise the behavior remains the same as before. - if (!base_namespace_present) { - out_file = grpc_generator::FileNameInUpperCamel(file, false) + file_suffix; - } else { - out_file = GRPC_CUSTOM_CSHARP_GETOUTPUTFILE(file, file_suffix, true, - base_namespace, error); - if (out_file.empty()) { - return false; - } - } - return true; -} - -// Get leading or trailing comments in a string. Comment lines start with "// ". -// Leading detached comments are put in front of leading comments. -template -inline std::string GetCsharpComments(const DescriptorType* desc, bool leading) { - return grpc_generator::GetPrefixedComments(desc, leading, "//"); -} - -} // namespace grpc_csharp_generator - -#endif // GRPC_INTERNAL_COMPILER_CSHARP_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/csharp_plugin.cc b/deps/grpc/src/compiler/csharp_plugin.cc deleted file mode 100644 index a7a2e74deb..0000000000 --- a/deps/grpc/src/compiler/csharp_plugin.cc +++ /dev/null @@ -1,110 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates C# gRPC service interface out of Protobuf IDL. - -#include - -#include "src/compiler/config.h" -#include "src/compiler/csharp_generator.h" -#include "src/compiler/csharp_generator_helpers.h" - -class CSharpGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - CSharpGrpcGenerator() {} - ~CSharpGrpcGenerator() {} - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } - -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* error) const override { - std::vector > options; - grpc::protobuf::compiler::ParseGeneratorParameter(parameter, &options); - - bool generate_client = true; - bool generate_server = true; - bool internal_access = false; - std::string base_namespace = ""; - bool base_namespace_present = false; - - // the suffix that will get appended to the name generated from the name - // of the original .proto file - std::string file_suffix = "Grpc.cs"; - for (size_t i = 0; i < options.size(); i++) { - if (options[i].first == "no_client") { - generate_client = false; - } else if (options[i].first == "no_server") { - generate_server = false; - } else if (options[i].first == "internal_access") { - internal_access = true; - } else if (options[i].first == "file_suffix") { - file_suffix = options[i].second; - } else if (options[i].first == "base_namespace") { - // Support for base_namespace option in this plugin is experimental. - // The option may be removed or file names generated may change - // in the future. - base_namespace = options[i].second; - base_namespace_present = true; - } else { - *error = "Unknown generator option: " + options[i].first; - return false; - } - } - - std::string code = grpc_csharp_generator::GetServices( - file, generate_client, generate_server, internal_access); - if (code.size() == 0) { - return true; // don't generate a file if there are no services - } - - // Get output file name. - std::string file_name; - if (!grpc_csharp_generator::ServicesFilename( - file, file_suffix, base_namespace_present, base_namespace, - file_name, error)) { - return false; - } - std::unique_ptr output( - context->Open(file_name)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - return true; - } -}; - -int main(int argc, char* argv[]) { - CSharpGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/generator_helpers.h b/deps/grpc/src/compiler/generator_helpers.h deleted file mode 100644 index 80649f3875..0000000000 --- a/deps/grpc/src/compiler/generator_helpers.h +++ /dev/null @@ -1,277 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_GENERATOR_HELPERS_H - -#include -#include -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/proto_parser_helper.h" - -namespace grpc_generator { - -inline bool StripSuffix(std::string* filename, const std::string& suffix) { - if (filename->length() >= suffix.length()) { - size_t suffix_pos = filename->length() - suffix.length(); - if (filename->compare(suffix_pos, std::string::npos, suffix) == 0) { - filename->resize(filename->size() - suffix.size()); - return true; - } - } - - return false; -} - -inline bool StripPrefix(std::string* name, const std::string& prefix) { - if (name->length() >= prefix.length()) { - if (name->substr(0, prefix.size()) == prefix) { - *name = name->substr(prefix.size()); - return true; - } - } - return false; -} - -inline std::string StripProto(std::string filename) { - if (!StripSuffix(&filename, ".protodevel")) { - StripSuffix(&filename, ".proto"); - } - return filename; -} - -inline std::string StringReplace(std::string str, const std::string& from, - const std::string& to, bool replace_all) { - size_t pos = 0; - - do { - pos = str.find(from, pos); - if (pos == std::string::npos) { - break; - } - str.replace(pos, from.length(), to); - pos += to.length(); - } while (replace_all); - - return str; -} - -inline std::string StringReplace(std::string str, const std::string& from, - const std::string& to) { - return StringReplace(str, from, to, true); -} - -inline std::vector tokenize(const std::string& input, - const std::string& delimiters) { - std::vector tokens; - size_t pos, last_pos = 0; - - for (;;) { - bool done = false; - pos = input.find_first_of(delimiters, last_pos); - if (pos == std::string::npos) { - done = true; - pos = input.length(); - } - - tokens.push_back(input.substr(last_pos, pos - last_pos)); - if (done) return tokens; - - last_pos = pos + 1; - } -} - -inline std::string CapitalizeFirstLetter(std::string s) { - if (s.empty()) { - return s; - } - s[0] = ::toupper(s[0]); - return s; -} - -inline std::string LowercaseFirstLetter(std::string s) { - if (s.empty()) { - return s; - } - s[0] = ::tolower(s[0]); - return s; -} - -inline std::string LowerUnderscoreToUpperCamel(std::string str) { - std::vector tokens = tokenize(str, "_"); - std::string result = ""; - for (unsigned int i = 0; i < tokens.size(); i++) { - result += CapitalizeFirstLetter(tokens[i]); - } - return result; -} - -inline std::string FileNameInUpperCamel( - const grpc::protobuf::FileDescriptor* file, bool include_package_path) { - std::vector tokens = tokenize(StripProto(file->name()), "/"); - std::string result = ""; - if (include_package_path) { - for (unsigned int i = 0; i < tokens.size() - 1; i++) { - result += tokens[i] + "/"; - } - } - result += LowerUnderscoreToUpperCamel(tokens.back()); - return result; -} - -inline std::string FileNameInUpperCamel( - const grpc::protobuf::FileDescriptor* file) { - return FileNameInUpperCamel(file, true); -} - -enum MethodType { - METHODTYPE_NO_STREAMING, - METHODTYPE_CLIENT_STREAMING, - METHODTYPE_SERVER_STREAMING, - METHODTYPE_BIDI_STREAMING -}; - -inline MethodType GetMethodType( - const grpc::protobuf::MethodDescriptor* method) { - if (method->client_streaming()) { - if (method->server_streaming()) { - return METHODTYPE_BIDI_STREAMING; - } else { - return METHODTYPE_CLIENT_STREAMING; - } - } else { - if (method->server_streaming()) { - return METHODTYPE_SERVER_STREAMING; - } else { - return METHODTYPE_NO_STREAMING; - } - } -} - -inline void Split(const std::string& s, char /*delim*/, - std::vector* append_to) { - std::istringstream iss(s); - std::string piece; - while (std::getline(iss, piece)) { - append_to->push_back(piece); - } -} - -enum CommentType { - COMMENTTYPE_LEADING, - COMMENTTYPE_TRAILING, - COMMENTTYPE_LEADING_DETACHED -}; - -// Get all the raw comments and append each line without newline to out. -template -inline void GetComment(const DescriptorType* desc, CommentType type, - std::vector* out) { - grpc::protobuf::SourceLocation location; - if (!desc->GetSourceLocation(&location)) { - return; - } - if (type == COMMENTTYPE_LEADING || type == COMMENTTYPE_TRAILING) { - const std::string& comments = type == COMMENTTYPE_LEADING - ? location.leading_comments - : location.trailing_comments; - Split(comments, '\n', out); - } else if (type == COMMENTTYPE_LEADING_DETACHED) { - for (unsigned int i = 0; i < location.leading_detached_comments.size(); - i++) { - Split(location.leading_detached_comments[i], '\n', out); - out->push_back(""); - } - } else { - std::cerr << "Unknown comment type " << type << std::endl; - abort(); - } -} - -// Each raw comment line without newline is appended to out. -// For file level leading and detached leading comments, we return comments -// above syntax line. Return nothing for trailing comments. -template <> -inline void GetComment(const grpc::protobuf::FileDescriptor* desc, - CommentType type, std::vector* out) { - if (type == COMMENTTYPE_TRAILING) { - return; - } - grpc::protobuf::SourceLocation location; - std::vector path; - path.push_back(grpc::protobuf::FileDescriptorProto::kSyntaxFieldNumber); - if (!desc->GetSourceLocation(path, &location)) { - return; - } - if (type == COMMENTTYPE_LEADING) { - Split(location.leading_comments, '\n', out); - } else if (type == COMMENTTYPE_LEADING_DETACHED) { - for (unsigned int i = 0; i < location.leading_detached_comments.size(); - i++) { - Split(location.leading_detached_comments[i], '\n', out); - out->push_back(""); - } - } else { - std::cerr << "Unknown comment type " << type << std::endl; - abort(); - } -} - -// Add prefix and newline to each comment line and concatenate them together. -// Make sure there is a space after the prefix unless the line is empty. -inline std::string GenerateCommentsWithPrefix( - const std::vector& in, const std::string& prefix) { - std::ostringstream oss; - for (auto it = in.begin(); it != in.end(); it++) { - const std::string& elem = *it; - if (elem.empty()) { - oss << prefix << "\n"; - } else if (elem[0] == ' ') { - oss << prefix << EscapeVariableDelimiters(elem) << "\n"; - } else { - oss << prefix << " " << EscapeVariableDelimiters(elem) << "\n"; - } - } - return oss.str(); -} - -template -inline std::string GetPrefixedComments(const DescriptorType* desc, bool leading, - const std::string& prefix) { - std::vector out; - if (leading) { - grpc_generator::GetComment( - desc, grpc_generator::COMMENTTYPE_LEADING_DETACHED, &out); - std::vector leading; - grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_LEADING, - &leading); - out.insert(out.end(), leading.begin(), leading.end()); - } else { - grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_TRAILING, - &out); - } - return GenerateCommentsWithPrefix(out, prefix); -} - -} // namespace grpc_generator - -#endif // GRPC_INTERNAL_COMPILER_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/node_generator.cc b/deps/grpc/src/compiler/node_generator.cc deleted file mode 100644 index 8c9f026308..0000000000 --- a/deps/grpc/src/compiler/node_generator.cc +++ /dev/null @@ -1,276 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/node_generator.h" - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/node_generator_helpers.h" - -using grpc::protobuf::Descriptor; -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::MethodDescriptor; -using grpc::protobuf::ServiceDescriptor; -using grpc::protobuf::io::Printer; -using grpc::protobuf::io::StringOutputStream; -using std::map; - -namespace grpc_node_generator { -namespace { - -// Returns the alias we assign to the module of the given .proto filename -// when importing. Copied entirely from -// github:google/protobuf/src/google/protobuf/compiler/js/js_generator.cc#L154 -std::string ModuleAlias(const std::string filename) { - // This scheme could technically cause problems if a file includes any 2 of: - // foo/bar_baz.proto - // foo_bar_baz.proto - // foo_bar/baz.proto - // - // We'll worry about this problem if/when we actually see it. This name isn't - // exposed to users so we can change it later if we need to. - std::string basename = grpc_generator::StripProto(filename); - basename = grpc_generator::StringReplace(basename, "-", "$"); - basename = grpc_generator::StringReplace(basename, "/", "_"); - basename = grpc_generator::StringReplace(basename, ".", "_"); - return basename + "_pb"; -} - -// Given a filename like foo/bar/baz.proto, returns the corresponding JavaScript -// message file foo/bar/baz.js -std::string GetJSMessageFilename(const std::string& filename) { - std::string name = filename; - return grpc_generator::StripProto(name) + "_pb.js"; -} - -// Given a filename like foo/bar/baz.proto, returns the root directory -// path ../../ -std::string GetRootPath(const std::string& from_filename, - const std::string& to_filename) { - if (to_filename.find("google/protobuf") == 0) { - // Well-known types (.proto files in the google/protobuf directory) are - // assumed to come from the 'google-protobuf' npm package. We may want to - // generalize this exception later by letting others put generated code in - // their own npm packages. - return "google-protobuf/"; - } - size_t slashes = std::count(from_filename.begin(), from_filename.end(), '/'); - if (slashes == 0) { - return "./"; - } - std::string result = ""; - for (size_t i = 0; i < slashes; i++) { - result += "../"; - } - return result; -} - -// Return the relative path to load to_file from the directory containing -// from_file, assuming that both paths are relative to the same directory -std::string GetRelativePath(const std::string& from_file, - const std::string& to_file) { - return GetRootPath(from_file, to_file) + to_file; -} - -/* Finds all message types used in all services in the file, and returns them - * as a map of fully qualified message type name to message descriptor */ -map GetAllMessages(const FileDescriptor* file) { - map message_types; - for (int service_num = 0; service_num < file->service_count(); - service_num++) { - const ServiceDescriptor* service = file->service(service_num); - for (int method_num = 0; method_num < service->method_count(); - method_num++) { - const MethodDescriptor* method = service->method(method_num); - const Descriptor* input_type = method->input_type(); - const Descriptor* output_type = method->output_type(); - message_types[input_type->full_name()] = input_type; - message_types[output_type->full_name()] = output_type; - } - } - return message_types; -} - -std::string MessageIdentifierName(const std::string& name) { - return grpc_generator::StringReplace(name, ".", "_"); -} - -std::string NodeObjectPath(const Descriptor* descriptor) { - std::string module_alias = ModuleAlias(descriptor->file()->name()); - std::string name = descriptor->full_name(); - grpc_generator::StripPrefix(&name, descriptor->file()->package() + "."); - return module_alias + "." + name; -} - -// Prints out the message serializer and deserializer functions -void PrintMessageTransformer(const Descriptor* descriptor, Printer* out, - const Parameters& params) { - map template_vars; - std::string full_name = descriptor->full_name(); - template_vars["identifier_name"] = MessageIdentifierName(full_name); - template_vars["name"] = full_name; - template_vars["node_name"] = NodeObjectPath(descriptor); - // Print the serializer - out->Print(template_vars, "function serialize_$identifier_name$(arg) {\n"); - out->Indent(); - out->Print(template_vars, "if (!(arg instanceof $node_name$)) {\n"); - out->Indent(); - out->Print(template_vars, - "throw new Error('Expected argument of type $name$');\n"); - out->Outdent(); - out->Print("}\n"); - if (params.minimum_node_version > 5) { - // Node version is > 5, we should use Buffer.from - out->Print("return Buffer.from(arg.serializeBinary());\n"); - } else { - out->Print("return new Buffer(arg.serializeBinary());\n"); - } - out->Outdent(); - out->Print("}\n\n"); - - // Print the deserializer - out->Print(template_vars, - "function deserialize_$identifier_name$(buffer_arg) {\n"); - out->Indent(); - out->Print( - template_vars, - "return $node_name$.deserializeBinary(new Uint8Array(buffer_arg));\n"); - out->Outdent(); - out->Print("}\n\n"); -} - -void PrintMethod(const MethodDescriptor* method, Printer* out) { - const Descriptor* input_type = method->input_type(); - const Descriptor* output_type = method->output_type(); - map vars; - vars["service_name"] = method->service()->full_name(); - vars["name"] = method->name(); - vars["input_type"] = NodeObjectPath(input_type); - vars["input_type_id"] = MessageIdentifierName(input_type->full_name()); - vars["output_type"] = NodeObjectPath(output_type); - vars["output_type_id"] = MessageIdentifierName(output_type->full_name()); - vars["client_stream"] = method->client_streaming() ? "true" : "false"; - vars["server_stream"] = method->server_streaming() ? "true" : "false"; - out->Print("{\n"); - out->Indent(); - out->Print(vars, "path: '/$service_name$/$name$',\n"); - out->Print(vars, "requestStream: $client_stream$,\n"); - out->Print(vars, "responseStream: $server_stream$,\n"); - out->Print(vars, "requestType: $input_type$,\n"); - out->Print(vars, "responseType: $output_type$,\n"); - out->Print(vars, "requestSerialize: serialize_$input_type_id$,\n"); - out->Print(vars, "requestDeserialize: deserialize_$input_type_id$,\n"); - out->Print(vars, "responseSerialize: serialize_$output_type_id$,\n"); - out->Print(vars, "responseDeserialize: deserialize_$output_type_id$,\n"); - out->Outdent(); - out->Print("}"); -} - -// Prints out the service descriptor object -void PrintService(const ServiceDescriptor* service, Printer* out) { - map template_vars; - out->Print(GetNodeComments(service, true).c_str()); - template_vars["name"] = service->name(); - out->Print(template_vars, "var $name$Service = exports.$name$Service = {\n"); - out->Indent(); - for (int i = 0; i < service->method_count(); i++) { - std::string method_name = - grpc_generator::LowercaseFirstLetter(service->method(i)->name()); - out->Print(GetNodeComments(service->method(i), true).c_str()); - out->Print("$method_name$: ", "method_name", method_name); - PrintMethod(service->method(i), out); - out->Print(",\n"); - out->Print(GetNodeComments(service->method(i), false).c_str()); - } - out->Outdent(); - out->Print("};\n\n"); - out->Print(template_vars, - "exports.$name$Client = " - "grpc.makeGenericClientConstructor($name$Service);\n"); - out->Print(GetNodeComments(service, false).c_str()); -} - -void PrintImports(const FileDescriptor* file, Printer* out) { - out->Print("var grpc = require('grpc');\n"); - if (file->message_type_count() > 0) { - std::string file_path = - GetRelativePath(file->name(), GetJSMessageFilename(file->name())); - out->Print("var $module_alias$ = require('$file_path$');\n", "module_alias", - ModuleAlias(file->name()), "file_path", file_path); - } - - for (int i = 0; i < file->dependency_count(); i++) { - std::string file_path = GetRelativePath( - file->name(), GetJSMessageFilename(file->dependency(i)->name())); - out->Print("var $module_alias$ = require('$file_path$');\n", "module_alias", - ModuleAlias(file->dependency(i)->name()), "file_path", - file_path); - } - out->Print("\n"); -} - -void PrintTransformers(const FileDescriptor* file, Printer* out, - const Parameters& params) { - map messages = GetAllMessages(file); - for (std::map::iterator it = messages.begin(); - it != messages.end(); it++) { - PrintMessageTransformer(it->second, out, params); - } - out->Print("\n"); -} - -void PrintServices(const FileDescriptor* file, Printer* out) { - for (int i = 0; i < file->service_count(); i++) { - PrintService(file->service(i), out); - } -} -} // namespace - -std::string GenerateFile(const FileDescriptor* file, const Parameters& params) { - std::string output; - { - StringOutputStream output_stream(&output); - Printer out(&output_stream, '$'); - - if (file->service_count() == 0) { - return output; - } - out.Print("// GENERATED CODE -- DO NOT EDIT!\n\n"); - - std::string leading_comments = GetNodeComments(file, true); - if (!leading_comments.empty()) { - out.Print("// Original file comments:\n"); - out.PrintRaw(leading_comments.c_str()); - } - - out.Print("'use strict';\n"); - - PrintImports(file, &out); - - PrintTransformers(file, &out, params); - - PrintServices(file, &out); - - out.Print(GetNodeComments(file, false).c_str()); - } - return output; -} - -} // namespace grpc_node_generator diff --git a/deps/grpc/src/compiler/node_generator.h b/deps/grpc/src/compiler/node_generator.h deleted file mode 100644 index 48709bac63..0000000000 --- a/deps/grpc/src/compiler/node_generator.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_NODE_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_NODE_GENERATOR_H - -#include "src/compiler/config.h" - -namespace grpc_node_generator { - -// Contains all the parameters that are parsed from the command line. -struct Parameters { - // Sets the earliest version of nodejs that needs to be supported. - int minimum_node_version; -}; - -std::string GenerateFile(const grpc::protobuf::FileDescriptor* file, - const Parameters& params); - -} // namespace grpc_node_generator - -#endif // GRPC_INTERNAL_COMPILER_NODE_GENERATOR_H diff --git a/deps/grpc/src/compiler/node_generator_helpers.h b/deps/grpc/src/compiler/node_generator_helpers.h deleted file mode 100644 index 65fc0a0026..0000000000 --- a/deps/grpc/src/compiler/node_generator_helpers.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_NODE_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_NODE_GENERATOR_HELPERS_H - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" - -namespace grpc_node_generator { - -inline std::string GetJSServiceFilename(const std::string& filename) { - return grpc_generator::StripProto(filename) + "_grpc_pb.js"; -} - -// Get leading or trailing comments in a string. Comment lines start with "// ". -// Leading detached comments are put in front of leading comments. -template -inline std::string GetNodeComments(const DescriptorType* desc, bool leading) { - return grpc_generator::GetPrefixedComments(desc, leading, "//"); -} - -} // namespace grpc_node_generator - -#endif // GRPC_INTERNAL_COMPILER_NODE_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/node_plugin.cc b/deps/grpc/src/compiler/node_plugin.cc deleted file mode 100644 index 9334024e41..0000000000 --- a/deps/grpc/src/compiler/node_plugin.cc +++ /dev/null @@ -1,82 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates Node gRPC service interface out of Protobuf IDL. - -#include - -#include "src/compiler/config.h" -#include "src/compiler/node_generator.h" -#include "src/compiler/node_generator_helpers.h" - -using grpc_node_generator::GenerateFile; -using grpc_node_generator::GetJSServiceFilename; - -class NodeGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - NodeGrpcGenerator() {} - ~NodeGrpcGenerator() {} - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL; - } - - bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* error) const override { - grpc_node_generator::Parameters generator_parameters; - generator_parameters.minimum_node_version = 4; - - if (!parameter.empty()) { - std::vector parameters_list = - grpc_generator::tokenize(parameter, ","); - for (auto parameter_string = parameters_list.begin(); - parameter_string != parameters_list.end(); parameter_string++) { - std::vector param = - grpc_generator::tokenize(*parameter_string, "="); - if (param[0] == "minimum_node_version") { - sscanf(param[1].c_str(), "%d", - &generator_parameters.minimum_node_version); - } else { - *error = std::string("Unknown parameter: ") + *parameter_string; - return false; - } - } - } - - std::string code = GenerateFile(file, generator_parameters); - if (code.size() == 0) { - return true; - } - - // Get output file name - std::string file_name = GetJSServiceFilename(file->name()); - - std::unique_ptr output( - context->Open(file_name)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - return true; - } -}; - -int main(int argc, char* argv[]) { - NodeGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/objective_c_generator.cc b/deps/grpc/src/compiler/objective_c_generator.cc deleted file mode 100644 index 2a2a9ebc0d..0000000000 --- a/deps/grpc/src/compiler/objective_c_generator.cc +++ /dev/null @@ -1,459 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/objective_c_generator.h" - -#include -#include -#include - -#include - -#include "src/compiler/config.h" -#include "src/compiler/objective_c_generator_helpers.h" - -using ::google::protobuf::compiler::objectivec::ClassName; -using ::grpc::protobuf::FileDescriptor; -using ::grpc::protobuf::MethodDescriptor; -using ::grpc::protobuf::ServiceDescriptor; -using ::grpc::protobuf::io::Printer; -using ::std::map; -using ::std::set; - -namespace grpc_objective_c_generator { -namespace { - -void PrintProtoRpcDeclarationAsPragma(Printer* printer, - const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - vars["client_stream"] = method->client_streaming() ? "stream " : ""; - vars["server_stream"] = method->server_streaming() ? "stream " : ""; - - printer->Print(vars, - "#pragma mark $method_name$($client_stream$$request_type$)" - " returns ($server_stream$$response_type$)\n\n"); -} - -template -static void PrintAllComments(const DescriptorType* desc, Printer* printer, - bool deprecated = false) { - std::vector comments; - grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_LEADING_DETACHED, - &comments); - grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_LEADING, - &comments); - grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_TRAILING, - &comments); - if (comments.empty()) { - return; - } - printer->Print("/**\n"); - for (auto it = comments.begin(); it != comments.end(); ++it) { - printer->Print(" * "); - size_t start_pos = it->find_first_not_of(' '); - if (start_pos != std::string::npos) { - printer->PrintRaw(it->c_str() + start_pos); - } - printer->Print("\n"); - } - if (deprecated) { - printer->Print(" *\n"); - printer->Print( - " * This method belongs to a set of APIs that have been deprecated. " - "Using" - " the v2 API is recommended.\n"); - } - printer->Print(" */\n"); -} - -void PrintMethodSignature(Printer* printer, const MethodDescriptor* method, - const map< ::std::string, ::std::string>& vars) { - // Print comment - PrintAllComments(method, printer, true); - - printer->Print(vars, "- ($return_type$)$method_name$With"); - if (method->client_streaming()) { - printer->Print("RequestsWriter:(GRXWriter *)requestWriter"); - } else { - printer->Print(vars, "Request:($request_class$ *)request"); - } - - // TODO(jcanizales): Put this on a new line and align colons. - if (method->server_streaming()) { - printer->Print(vars, - " eventHandler:(void(^)(BOOL done, " - "$response_class$ *_Nullable response, NSError *_Nullable " - "error))eventHandler"); - } else { - printer->Print(vars, - " handler:(void(^)($response_class$ *_Nullable response, " - "NSError *_Nullable error))handler"); - } -} - -void PrintSimpleSignature(Printer* printer, const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - vars["method_name"] = - grpc_generator::LowercaseFirstLetter(vars["method_name"]); - vars["return_type"] = "void"; - PrintMethodSignature(printer, method, vars); -} - -void PrintAdvancedSignature(Printer* printer, const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - vars["method_name"] = "RPCTo" + vars["method_name"]; - vars["return_type"] = "GRPCProtoCall *"; - PrintMethodSignature(printer, method, vars); -} - -void PrintV2Signature(Printer* printer, const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - if (method->client_streaming()) { - vars["return_type"] = "GRPCStreamingProtoCall *"; - } else { - vars["return_type"] = "GRPCUnaryProtoCall *"; - } - vars["method_name"] = - grpc_generator::LowercaseFirstLetter(vars["method_name"]); - - PrintAllComments(method, printer); - - printer->Print(vars, "- ($return_type$)$method_name$With"); - if (method->client_streaming()) { - printer->Print("ResponseHandler:(id)handler"); - } else { - printer->Print(vars, - "Message:($request_class$ *)message " - "responseHandler:(id)handler"); - } - printer->Print(" callOptions:(GRPCCallOptions *_Nullable)callOptions"); -} - -inline map< ::std::string, ::std::string> GetMethodVars( - const MethodDescriptor* method) { - map< ::std::string, ::std::string> res; - res["method_name"] = method->name(); - res["request_type"] = method->input_type()->name(); - res["response_type"] = method->output_type()->name(); - res["request_class"] = ClassName(method->input_type()); - res["response_class"] = ClassName(method->output_type()); - return res; -} - -void PrintMethodDeclarations(Printer* printer, const MethodDescriptor* method) { - if (!ShouldIncludeMethod(method)) return; - - map< ::std::string, ::std::string> vars = GetMethodVars(method); - - PrintProtoRpcDeclarationAsPragma(printer, method, vars); - - PrintSimpleSignature(printer, method, vars); - printer->Print(";\n\n"); - PrintAdvancedSignature(printer, method, vars); - printer->Print(";\n\n\n"); -} - -void PrintV2MethodDeclarations(Printer* printer, - const MethodDescriptor* method) { - if (!ShouldIncludeMethod(method)) return; - - map< ::std::string, ::std::string> vars = GetMethodVars(method); - - PrintProtoRpcDeclarationAsPragma(printer, method, vars); - - PrintV2Signature(printer, method, vars); - printer->Print(";\n\n"); -} - -void PrintSimpleImplementation(Printer* printer, const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - printer->Print("{\n"); - printer->Print(vars, " [[self RPCTo$method_name$With"); - if (method->client_streaming()) { - printer->Print("RequestsWriter:requestWriter"); - } else { - printer->Print("Request:request"); - } - if (method->server_streaming()) { - printer->Print(" eventHandler:eventHandler] start];\n"); - } else { - printer->Print(" handler:handler] start];\n"); - } - printer->Print("}\n"); -} - -void PrintAdvancedImplementation(Printer* printer, - const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - printer->Print("{\n"); - printer->Print(vars, " return [self RPCToMethod:@\"$method_name$\"\n"); - - printer->Print(" requestsWriter:"); - if (method->client_streaming()) { - printer->Print("requestWriter\n"); - } else { - printer->Print("[GRXWriter writerWithValue:request]\n"); - } - - printer->Print(vars, " responseClass:[$response_class$ class]\n"); - - printer->Print(" responsesWriteable:[GRXWriteable "); - if (method->server_streaming()) { - printer->Print("writeableWithEventHandler:eventHandler]];\n"); - } else { - printer->Print("writeableWithSingleHandler:handler]];\n"); - } - - printer->Print("}\n"); -} - -void PrintV2Implementation(Printer* printer, const MethodDescriptor* method, - map< ::std::string, ::std::string> vars) { - printer->Print(" {\n"); - if (method->client_streaming()) { - printer->Print(vars, " return [self RPCToMethod:@\"$method_name$\"\n"); - printer->Print(" responseHandler:handler\n"); - printer->Print(" callOptions:callOptions\n"); - printer->Print( - vars, " responseClass:[$response_class$ class]];\n}\n\n"); - } else { - printer->Print(vars, " return [self RPCToMethod:@\"$method_name$\"\n"); - printer->Print(" message:message\n"); - printer->Print(" responseHandler:handler\n"); - printer->Print(" callOptions:callOptions\n"); - printer->Print( - vars, " responseClass:[$response_class$ class]];\n}\n\n"); - } -} - -void PrintMethodImplementations(Printer* printer, - const MethodDescriptor* method, - const Parameters& generator_params) { - if (!ShouldIncludeMethod(method)) return; - - map< ::std::string, ::std::string> vars = GetMethodVars(method); - - PrintProtoRpcDeclarationAsPragma(printer, method, vars); - - if (!generator_params.no_v1_compatibility) { - // TODO(jcanizales): Print documentation from the method. - PrintSimpleSignature(printer, method, vars); - PrintSimpleImplementation(printer, method, vars); - - printer->Print("// Returns a not-yet-started RPC object.\n"); - PrintAdvancedSignature(printer, method, vars); - PrintAdvancedImplementation(printer, method, vars); - } - - PrintV2Signature(printer, method, vars); - PrintV2Implementation(printer, method, vars); -} - -} // namespace - -::std::string GetAllMessageClasses(const FileDescriptor* file) { - ::std::string output; - set< ::std::string> classes; - for (int i = 0; i < file->service_count(); i++) { - const auto service = file->service(i); - for (int i = 0; i < service->method_count(); i++) { - const auto method = service->method(i); - if (ShouldIncludeMethod(method)) { - classes.insert(ClassName(method->input_type())); - classes.insert(ClassName(method->output_type())); - } - } - } - for (auto one_class : classes) { - output += "@class " + one_class + ";\n"; - } - - return output; -} - -::std::string GetProtocol(const ServiceDescriptor* service, - const Parameters& generator_params) { - ::std::string output; - - if (generator_params.no_v1_compatibility) return output; - - // Scope the output stream so it closes and finalizes output to the string. - grpc::protobuf::io::StringOutputStream output_stream(&output); - Printer printer(&output_stream, '$'); - - map< ::std::string, ::std::string> vars = { - {"service_class", ServiceClassName(service)}}; - - printer.Print(vars, - "/**\n" - " * The methods in this protocol belong to a set of old APIs " - "that have been deprecated. They do not\n" - " * recognize call options provided in the initializer. Using " - "the v2 protocol is recommended.\n" - " */\n"); - printer.Print(vars, "@protocol $service_class$ \n\n"); - for (int i = 0; i < service->method_count(); i++) { - PrintMethodDeclarations(&printer, service->method(i)); - } - printer.Print("@end\n\n"); - - return output; -} - -::std::string GetV2Protocol(const ServiceDescriptor* service) { - ::std::string output; - - // Scope the output stream so it closes and finalizes output to the string. - grpc::protobuf::io::StringOutputStream output_stream(&output); - Printer printer(&output_stream, '$'); - - map< ::std::string, ::std::string> vars = { - {"service_class", ServiceClassName(service) + "2"}}; - - printer.Print(vars, "@protocol $service_class$ \n\n"); - for (int i = 0; i < service->method_count(); i++) { - PrintV2MethodDeclarations(&printer, service->method(i)); - } - printer.Print("@end\n\n"); - - return output; -} - -::std::string GetInterface(const ServiceDescriptor* service, - const Parameters& generator_params) { - ::std::string output; - - // Scope the output stream so it closes and finalizes output to the string. - grpc::protobuf::io::StringOutputStream output_stream(&output); - Printer printer(&output_stream, '$'); - - map< ::std::string, ::std::string> vars = { - {"service_class", ServiceClassName(service)}}; - - printer.Print(vars, - "/**\n" - " * Basic service implementation, over gRPC, that only does\n" - " * marshalling and parsing.\n" - " */\n"); - printer.Print(vars, - "@interface $service_class$ :" - " GRPCProtoService<$service_class$2"); - if (!generator_params.no_v1_compatibility) { - printer.Print(vars, ", $service_class$"); - } - printer.Print(">\n"); - printer.Print( - "- (instancetype)initWithHost:(NSString *)host " - "callOptions:(GRPCCallOptions " - "*_Nullable)callOptions" - " NS_DESIGNATED_INITIALIZER;\n"); - printer.Print( - "+ (instancetype)serviceWithHost:(NSString *)host " - "callOptions:(GRPCCallOptions *_Nullable)callOptions;\n"); - if (!generator_params.no_v1_compatibility) { - printer.Print( - "// The following methods belong to a set of old APIs that have been " - "deprecated.\n"); - printer.Print("- (instancetype)initWithHost:(NSString *)host;\n"); - printer.Print("+ (instancetype)serviceWithHost:(NSString *)host;\n"); - } - printer.Print("@end\n"); - - return output; -} - -::std::string GetSource(const ServiceDescriptor* service, - const Parameters& generator_params) { - ::std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - grpc::protobuf::io::StringOutputStream output_stream(&output); - Printer printer(&output_stream, '$'); - - map< ::std::string, ::std::string> vars = { - {"service_name", service->name()}, - {"service_class", ServiceClassName(service)}, - {"package", service->file()->package()}}; - - printer.Print(vars, - "@implementation $service_class$\n\n" - "#pragma clang diagnostic push\n" - "#pragma clang diagnostic ignored " - "\"-Wobjc-designated-initializers\"\n\n" - "// Designated initializer\n" - "- (instancetype)initWithHost:(NSString *)host " - "callOptions:(GRPCCallOptions *_Nullable)callOptions {\n" - " return [super initWithHost:host\n" - " packageName:@\"$package$\"\n" - " serviceName:@\"$service_name$\"\n" - " callOptions:callOptions];\n" - "}\n\n"); - if (!generator_params.no_v1_compatibility) { - printer.Print(vars, - "- (instancetype)initWithHost:(NSString *)host {\n" - " return [super initWithHost:host\n" - " packageName:@\"$package$\"\n" - " serviceName:@\"$service_name$\"];\n" - "}\n\n"); - } - printer.Print("#pragma clang diagnostic pop\n\n"); - - if (!generator_params.no_v1_compatibility) { - printer.Print( - "// Override superclass initializer to disallow different" - " package and service names.\n" - "- (instancetype)initWithHost:(NSString *)host\n" - " packageName:(NSString *)packageName\n" - " serviceName:(NSString *)serviceName {\n" - " return [self initWithHost:host];\n" - "}\n\n"); - } - printer.Print( - "- (instancetype)initWithHost:(NSString *)host\n" - " packageName:(NSString *)packageName\n" - " serviceName:(NSString *)serviceName\n" - " callOptions:(GRPCCallOptions *)callOptions {\n" - " return [self initWithHost:host callOptions:callOptions];\n" - "}\n\n"); - - printer.Print("#pragma mark - Class Methods\n\n"); - if (!generator_params.no_v1_compatibility) { - printer.Print( - "+ (instancetype)serviceWithHost:(NSString *)host {\n" - " return [[self alloc] initWithHost:host];\n" - "}\n\n"); - } - printer.Print( - "+ (instancetype)serviceWithHost:(NSString *)host " - "callOptions:(GRPCCallOptions *_Nullable)callOptions {\n" - " return [[self alloc] initWithHost:host callOptions:callOptions];\n" - "}\n\n"); - - printer.Print("#pragma mark - Method Implementations\n\n"); - - for (int i = 0; i < service->method_count(); i++) { - PrintMethodImplementations(&printer, service->method(i), - generator_params); - } - - printer.Print("@end\n"); - } - return output; -} - -} // namespace grpc_objective_c_generator diff --git a/deps/grpc/src/compiler/objective_c_generator.h b/deps/grpc/src/compiler/objective_c_generator.h deleted file mode 100644 index e010d9a82c..0000000000 --- a/deps/grpc/src/compiler/objective_c_generator.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_H - -#include "src/compiler/config.h" - -namespace grpc_objective_c_generator { - -struct Parameters { - // Do not generate V1 interface and implementation - bool no_v1_compatibility; -}; - -using ::grpc::protobuf::FileDescriptor; -using ::grpc::protobuf::ServiceDescriptor; - -// Returns forward declaration of classes in the generated header file. -std::string GetAllMessageClasses(const FileDescriptor* file); - -// Returns the content to be included defining the @protocol segment at the -// insertion point of the generated implementation file. This interface is -// legacy and for backwards compatibility. -std::string GetProtocol(const ServiceDescriptor* service, - const Parameters& generator_params); - -// Returns the content to be included defining the @protocol segment at the -// insertion point of the generated implementation file. -std::string GetV2Protocol(const ServiceDescriptor* service); - -// Returns the content to be included defining the @interface segment at the -// insertion point of the generated implementation file. -std::string GetInterface(const ServiceDescriptor* service, - const Parameters& generator_params); - -// Returns the content to be included in the "global_scope" insertion point of -// the generated implementation file. -std::string GetSource(const ServiceDescriptor* service, - const Parameters& generator_params); - -} // namespace grpc_objective_c_generator - -#endif // GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_H diff --git a/deps/grpc/src/compiler/objective_c_generator_helpers.h b/deps/grpc/src/compiler/objective_c_generator_helpers.h deleted file mode 100644 index 8490ecf6a0..0000000000 --- a/deps/grpc/src/compiler/objective_c_generator_helpers.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H - -#include - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" - -namespace grpc_objective_c_generator { - -using ::grpc::protobuf::FileDescriptor; -using ::grpc::protobuf::MethodDescriptor; -using ::grpc::protobuf::ServiceDescriptor; - -inline std::string MessageHeaderName(const FileDescriptor* file) { - return google::protobuf::compiler::objectivec::FilePath(file) + ".pbobjc.h"; -} - -inline bool AsciiIsUpper(char c) { return c >= 'A' && c <= 'Z'; } - -inline ::std::string ServiceClassName(const ServiceDescriptor* service) { - const FileDescriptor* file = service->file(); - ::std::string prefix = - google::protobuf::compiler::objectivec::FileClassPrefix(file); - ::std::string class_name = service->name(); - // We add the prefix in the cases where the string is missing a prefix. - // We define "missing a prefix" as where 'input': - // a) Doesn't start with the prefix or - // b) Isn't equivalent to the prefix or - // c) Has the prefix, but the letter after the prefix is lowercase - // This is the same semantics as the Objective-C protoc. - // https://github.com/protocolbuffers/protobuf/blob/c160ae52a91ca4c76936531d68cc846f8230dbb1/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc#L389 - if (class_name.rfind(prefix, 0) == 0) { - if (class_name.length() == prefix.length() || - !AsciiIsUpper(class_name[prefix.length()])) { - return prefix + class_name; - } else { - return class_name; - } - } else { - return prefix + class_name; - } -} - -inline ::std::string LocalImport(const ::std::string& import) { - return ::std::string("#import \"" + import + "\"\n"); -} - -inline ::std::string FrameworkImport(const ::std::string& import, - const ::std::string& framework) { - // Flattens the directory structure: grab the file name only - std::size_t pos = import.rfind("/"); - // If pos is npos, pos + 1 is 0, which gives us the entire string, - // so there's no need to check that - ::std::string filename = import.substr(pos + 1, import.size() - (pos + 1)); - return ::std::string("#import <" + framework + "/" + filename + ">\n"); -} - -inline ::std::string SystemImport(const ::std::string& import) { - return ::std::string("#import <" + import + ">\n"); -} - -inline ::std::string PreprocConditional(::std::string symbol, bool invert) { - return invert ? "!defined(" + symbol + ") || !" + symbol - : "defined(" + symbol + ") && " + symbol; -} - -inline ::std::string PreprocIf(const ::std::string& symbol, - const ::std::string& if_true) { - return ::std::string("#if " + PreprocConditional(symbol, false) + "\n" + - if_true + "#endif\n"); -} - -inline ::std::string PreprocIfNot(const ::std::string& symbol, - const ::std::string& if_true) { - return ::std::string("#if " + PreprocConditional(symbol, true) + "\n" + - if_true + "#endif\n"); -} - -inline ::std::string PreprocIfElse(const ::std::string& symbol, - const ::std::string& if_true, - const ::std::string& if_false) { - return ::std::string("#if " + PreprocConditional(symbol, false) + "\n" + - if_true + "#else\n" + if_false + "#endif\n"); -} - -inline ::std::string PreprocIfNotElse(const ::std::string& symbol, - const ::std::string& if_true, - const ::std::string& if_false) { - return ::std::string("#if " + PreprocConditional(symbol, true) + "\n" + - if_true + "#else\n" + if_false + "#endif\n"); -} - -inline bool ShouldIncludeMethod(const MethodDescriptor* method) { -#ifdef OBJC_SKIP_METHODS_WITHOUT_MESSAGE_PREFIX - return (method->input_type()->file()->options().has_objc_class_prefix() && - method->output_type()->file()->options().has_objc_class_prefix()); -#else - (void)method; // to silence the unused warning for method. - return true; -#endif -} - -} // namespace grpc_objective_c_generator -#endif // GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/objective_c_plugin.cc b/deps/grpc/src/compiler/objective_c_plugin.cc deleted file mode 100644 index 4b0f296421..0000000000 --- a/deps/grpc/src/compiler/objective_c_plugin.cc +++ /dev/null @@ -1,340 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates Objective C gRPC service interface out of Protobuf IDL. - -#include - -#include - -#include "src/compiler/config.h" -#include "src/compiler/objective_c_generator.h" -#include "src/compiler/objective_c_generator_helpers.h" - -using ::google::protobuf::compiler::objectivec:: - IsProtobufLibraryBundledProtoFile; -using ::google::protobuf::compiler::objectivec::ProtobufLibraryFrameworkName; -#ifdef SUPPORT_OBJC_PREFIX_VALIDATION -using ::google::protobuf::compiler::objectivec::ValidateObjCClassPrefixes; -#endif -using ::grpc_objective_c_generator::FrameworkImport; -using ::grpc_objective_c_generator::LocalImport; -using ::grpc_objective_c_generator::PreprocIfElse; -using ::grpc_objective_c_generator::PreprocIfNot; -using ::grpc_objective_c_generator::SystemImport; - -namespace { - -inline ::std::string ImportProtoHeaders( - const grpc::protobuf::FileDescriptor* dep, const char* indent, - const ::std::string& framework, - const ::std::string& pb_runtime_import_prefix) { - ::std::string header = grpc_objective_c_generator::MessageHeaderName(dep); - - if (!IsProtobufLibraryBundledProtoFile(dep)) { - if (framework.empty()) { - return indent + LocalImport(header); - } else { - return indent + FrameworkImport(header, framework); - } - } - - ::std::string base_name = header; - grpc_generator::StripPrefix(&base_name, "google/protobuf/"); - ::std::string file_name = "GPB" + base_name; - // create the import code snippet - ::std::string framework_header = - ::std::string(ProtobufLibraryFrameworkName) + "/" + file_name; - ::std::string local_header = file_name; - if (!pb_runtime_import_prefix.empty()) { - local_header = pb_runtime_import_prefix + "/" + file_name; - } - - static const ::std::string kFrameworkImportsCondition = - "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS"; - return PreprocIfElse(kFrameworkImportsCondition, - indent + SystemImport(framework_header), - indent + LocalImport(local_header)); -} - -} // namespace - -class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - ObjectiveCGrpcGenerator() {} - virtual ~ObjectiveCGrpcGenerator() {} - - public: - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } - -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - virtual bool Generate(const grpc::protobuf::FileDescriptor* file, - const ::std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - ::std::string* error) const override { - if (file->service_count() == 0) { - // No services. Do nothing. - return true; - } - -#ifdef SUPPORT_OBJC_PREFIX_VALIDATION - // Default options will use env variables for controls. - if (!ValidateObjCClassPrefixes({file}, {}, error)) { - return false; - } -#endif - - bool grpc_local_import = false; - ::std::string framework; - ::std::string pb_runtime_import_prefix; - ::std::string grpc_local_import_prefix; - std::vector<::std::string> params_list = - grpc_generator::tokenize(parameter, ","); - for (auto param_str = params_list.begin(); param_str != params_list.end(); - ++param_str) { - std::vector<::std::string> param = - grpc_generator::tokenize(*param_str, "="); - if (param[0] == "generate_for_named_framework") { - if (param.size() != 2) { - *error = - std::string("Format: generate_for_named_framework="); - return false; - } else if (param[1].empty()) { - *error = - std::string("Name of framework cannot be empty for parameter: ") + - param[0]; - return false; - } - framework = param[1]; - } else if (param[0] == "runtime_import_prefix") { - if (param.size() != 2) { - *error = grpc::string("Format: runtime_import_prefix=dir/"); - return false; - } - pb_runtime_import_prefix = param[1]; - grpc_generator::StripSuffix(&pb_runtime_import_prefix, "/"); - } else if (param[0] == "grpc_local_import_prefix") { - grpc_local_import = true; - if (param.size() != 2) { - *error = grpc::string("Format: grpc_local_import_prefix=dir/"); - return false; - } - grpc_local_import_prefix = param[1]; - } - } - - static const ::std::string kNonNullBegin = "NS_ASSUME_NONNULL_BEGIN\n"; - static const ::std::string kNonNullEnd = "NS_ASSUME_NONNULL_END\n"; - static const ::std::string kProtocolOnly = "GPB_GRPC_PROTOCOL_ONLY"; - static const ::std::string kForwardDeclare = - "GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO"; - - ::std::string file_name = - google::protobuf::compiler::objectivec::FilePath(file); - - grpc_objective_c_generator::Parameters generator_params; - generator_params.no_v1_compatibility = false; - - if (!parameter.empty()) { - std::vector parameters_list = - grpc_generator::tokenize(parameter, ","); - for (auto parameter_string = parameters_list.begin(); - parameter_string != parameters_list.end(); parameter_string++) { - std::vector param = - grpc_generator::tokenize(*parameter_string, "="); - if (param[0] == "no_v1_compatibility") { - generator_params.no_v1_compatibility = true; - } - } - } - - // Write out a file header. - ::std::string file_header = - "// Code generated by gRPC proto compiler. DO NOT EDIT!\n" - "// source: " + - file->name() + "\n\n"; - - { - // Generate .pbrpc.h - - ::std::string imports; - if (framework.empty()) { - imports = LocalImport(file_name + ".pbobjc.h"); - } else { - imports = FrameworkImport(file_name + ".pbobjc.h", framework); - } - - ::std::string system_imports; - if (grpc_local_import) { - system_imports = - LocalImport(grpc_local_import_prefix + "ProtoRPC/ProtoService.h"); - if (generator_params.no_v1_compatibility) { - system_imports += - LocalImport(grpc_local_import_prefix + "ProtoRPC/ProtoRPC.h"); - } else { - system_imports += LocalImport(grpc_local_import_prefix + - "ProtoRPC/ProtoRPCLegacy.h"); - system_imports += LocalImport(grpc_local_import_prefix + - "RxLibrary/GRXWriteable.h"); - system_imports += - LocalImport(grpc_local_import_prefix + "RxLibrary/GRXWriter.h"); - } - } else { - system_imports = SystemImport("ProtoRPC/ProtoService.h"); - if (generator_params.no_v1_compatibility) { - system_imports += SystemImport("ProtoRPC/ProtoRPC.h"); - } else { - system_imports += SystemImport("ProtoRPC/ProtoRPCLegacy.h"); - system_imports += SystemImport("RxLibrary/GRXWriteable.h"); - system_imports += SystemImport("RxLibrary/GRXWriter.h"); - } - } - - ::std::string forward_declarations = - "@class GRPCUnaryProtoCall;\n" - "@class GRPCStreamingProtoCall;\n" - "@class GRPCCallOptions;\n" - "@protocol GRPCProtoResponseHandler;\n"; - if (!generator_params.no_v1_compatibility) { - forward_declarations += "@class GRPCProtoCall;\n"; - } - forward_declarations += "\n"; - - ::std::string class_declarations = - grpc_objective_c_generator::GetAllMessageClasses(file); - - ::std::string class_imports; - for (int i = 0; i < file->dependency_count(); i++) { - class_imports += ImportProtoHeaders( - file->dependency(i), " ", framework, pb_runtime_import_prefix); - } - - ::std::string ng_protocols; - for (int i = 0; i < file->service_count(); i++) { - const grpc::protobuf::ServiceDescriptor* service = file->service(i); - ng_protocols += grpc_objective_c_generator::GetV2Protocol(service); - } - - ::std::string protocols; - for (int i = 0; i < file->service_count(); i++) { - const grpc::protobuf::ServiceDescriptor* service = file->service(i); - protocols += - grpc_objective_c_generator::GetProtocol(service, generator_params); - } - - ::std::string interfaces; - for (int i = 0; i < file->service_count(); i++) { - const grpc::protobuf::ServiceDescriptor* service = file->service(i); - interfaces += - grpc_objective_c_generator::GetInterface(service, generator_params); - } - - Write(context, file_name + ".pbrpc.h", - file_header + SystemImport("Foundation/Foundation.h") + "\n" + - PreprocIfNot(kForwardDeclare, imports) + "\n" + - PreprocIfNot(kProtocolOnly, system_imports) + "\n" + - class_declarations + "\n" + - PreprocIfNot(kForwardDeclare, class_imports) + "\n" + - forward_declarations + "\n" + kNonNullBegin + "\n" + - ng_protocols + protocols + "\n" + - PreprocIfNot(kProtocolOnly, interfaces) + "\n" + kNonNullEnd + - "\n"); - } - - { - // Generate .pbrpc.m - - ::std::string imports; - if (framework.empty()) { - imports = LocalImport(file_name + ".pbrpc.h") + - LocalImport(file_name + ".pbobjc.h"); - } else { - imports = FrameworkImport(file_name + ".pbrpc.h", framework) + - FrameworkImport(file_name + ".pbobjc.h", framework); - } - - if (grpc_local_import) { - if (generator_params.no_v1_compatibility) { - imports += - LocalImport(grpc_local_import_prefix + "ProtoRPC/ProtoRPC.h"); - } else { - imports += LocalImport(grpc_local_import_prefix + - "ProtoRPC/ProtoRPCLegacy.h"); - imports += LocalImport(grpc_local_import_prefix + - "RxLibrary/GRXWriter+Immediate.h"); - } - } else { - if (generator_params.no_v1_compatibility) { - imports += SystemImport("ProtoRPC/ProtoRPC.h"); - } else { - imports += SystemImport("ProtoRPC/ProtoRPCLegacy.h"); - imports += SystemImport("RxLibrary/GRXWriter+Immediate.h"); - } - } - - ::std::string class_imports; - for (int i = 0; i < file->dependency_count(); i++) { - class_imports += ImportProtoHeaders(file->dependency(i), "", framework, - pb_runtime_import_prefix); - } - - ::std::string definitions; - for (int i = 0; i < file->service_count(); i++) { - const grpc::protobuf::ServiceDescriptor* service = file->service(i); - definitions += - grpc_objective_c_generator::GetSource(service, generator_params); - } - - Write(context, file_name + ".pbrpc.m", - file_header + - PreprocIfNot(kProtocolOnly, imports + "\n" + class_imports + - "\n" + definitions)); - } - - return true; - } - - private: - // Write the given code into the given file. - void Write(grpc::protobuf::compiler::GeneratorContext* context, - const ::std::string& filename, const ::std::string& code) const { - std::unique_ptr output( - context->Open(filename)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - } -}; - -int main(int argc, char* argv[]) { - ObjectiveCGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/php_generator.cc b/deps/grpc/src/compiler/php_generator.cc deleted file mode 100644 index 7d42dc8f1a..0000000000 --- a/deps/grpc/src/compiler/php_generator.cc +++ /dev/null @@ -1,352 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/php_generator_helpers.h" - -using google::protobuf::compiler::php::GeneratedClassName; -using grpc::protobuf::Descriptor; -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::MethodDescriptor; -using grpc::protobuf::ServiceDescriptor; -using grpc::protobuf::io::Printer; -using grpc::protobuf::io::StringOutputStream; -using std::map; - -namespace grpc_php_generator { -namespace { - -std::string ConvertToPhpNamespace(const std::string& name) { - std::vector tokens = grpc_generator::tokenize(name, "."); - std::ostringstream oss; - for (unsigned int i = 0; i < tokens.size(); i++) { - oss << (i == 0 ? "" : "\\") - << grpc_generator::CapitalizeFirstLetter(tokens[i]); - } - return oss.str(); -} - -std::string PackageName(const FileDescriptor* file) { - if (file->options().has_php_namespace()) { - return file->options().php_namespace(); - } else { - return ConvertToPhpNamespace(file->package()); - } -} - -std::string MessageIdentifierName(const std::string& name, - const FileDescriptor* file) { - std::vector tokens = grpc_generator::tokenize(name, "."); - std::ostringstream oss; - if (PackageName(file) != "") { - oss << PackageName(file) << "\\"; - } - oss << grpc_generator::CapitalizeFirstLetter(tokens[tokens.size() - 1]); - return oss.str(); -} - -void PrintMethod(const MethodDescriptor* method, Printer* out) { - const Descriptor* input_type = method->input_type(); - const Descriptor* output_type = method->output_type(); - map vars; - vars["service_name"] = method->service()->full_name(); - vars["name"] = method->name(); - vars["input_type_id"] = - MessageIdentifierName(GeneratedClassName(input_type), input_type->file()); - vars["output_type_id"] = MessageIdentifierName( - GeneratedClassName(output_type), output_type->file()); - - out->Print("/**\n"); - if (method->options().deprecated()) { - out->Print(" * @deprecated\n"); - } - out->Print(GetPHPComments(method, " *").c_str()); - if (method->client_streaming()) { - if (method->server_streaming()) { - vars["return_type_id"] = "\\Grpc\\BidiStreamingCall"; - } else { - vars["return_type_id"] = "\\Grpc\\ClientStreamingCall"; - } - out->Print(vars, - " * @param array $$metadata metadata\n" - " * @param array $$options call options\n" - " * @return $return_type_id$\n */\n" - "public function $name$($$metadata = [], " - "$$options = []) {\n"); - out->Indent(); - out->Indent(); - if (method->server_streaming()) { - out->Print("return $$this->_bidiRequest("); - } else { - out->Print("return $$this->_clientStreamRequest("); - } - out->Print(vars, - "'/$service_name$/$name$',\n" - "['\\$output_type_id$','decode'],\n" - "$$metadata, $$options);\n"); - } else { - if (method->server_streaming()) { - vars["return_type_id"] = "\\Grpc\\ServerStreamingCall"; - } else { - vars["return_type_id"] = "\\Grpc\\UnaryCall"; - } - out->Print(vars, - " * @param \\$input_type_id$ $$argument input argument\n" - " * @param array $$metadata metadata\n" - " * @param array $$options call options\n" - " * @return $return_type_id$\n */\n" - "public function $name$(\\$input_type_id$ $$argument,\n" - " $$metadata = [], $$options = []) {\n"); - out->Indent(); - out->Indent(); - if (method->server_streaming()) { - out->Print("return $$this->_serverStreamRequest("); - } else { - out->Print("return $$this->_simpleRequest("); - } - out->Print(vars, - "'/$service_name$/$name$',\n" - "$$argument,\n" - "['\\$output_type_id$', 'decode'],\n" - "$$metadata, $$options);\n"); - } - out->Outdent(); - out->Outdent(); - out->Print("}\n\n"); -} - -void PrintServerMethod(const MethodDescriptor* method, Printer* out) { - map vars; - const Descriptor* input_type = method->input_type(); - const Descriptor* output_type = method->output_type(); - vars["service_name"] = method->service()->full_name(); - vars["method_name"] = method->name(); - vars["input_type_id"] = - MessageIdentifierName(GeneratedClassName(input_type), input_type->file()); - vars["output_type_id"] = MessageIdentifierName( - GeneratedClassName(output_type), output_type->file()); - - out->Print("/**\n"); - if (method->options().deprecated()) { - out->Print(" * @deprecated\n"); - } - out->Print(GetPHPComments(method, " *").c_str()); - - const char* method_template; - if (method->client_streaming() && method->server_streaming()) { - method_template = - " * @param \\Grpc\\ServerCallReader $$reader read client request data " - "of \\$input_type_id$\n" - " * @param \\Grpc\\ServerCallWriter $$writer write response data of " - "\\$output_type_id$\n" - " * @param \\Grpc\\ServerContext $$context server request context\n" - " * @return void\n" - " */\n" - "public function $method_name$(\n" - " \\Grpc\\ServerCallReader $$reader,\n" - " \\Grpc\\ServerCallWriter $$writer,\n" - " \\Grpc\\ServerContext $$context\n" - "): void {\n" - " $$context->setStatus(\\Grpc\\Status::unimplemented());\n" - " $$writer->finish();\n" - "}\n\n"; - } else if (method->client_streaming()) { - method_template = - " * @param \\Grpc\\ServerCallReader $$reader read client request data " - "of \\$input_type_id$\n" - " * @param \\Grpc\\ServerContext $$context server request context\n" - " * @return \\$output_type_id$ for response data, null if if error " - "occured\n" - " * initial metadata (if any) and status (if not ok) should be set " - "to $$context\n" - " */\n" - "public function $method_name$(\n" - " \\Grpc\\ServerCallReader $$reader,\n" - " \\Grpc\\ServerContext $$context\n" - "): ?\\$output_type_id$ {\n" - " $$context->setStatus(\\Grpc\\Status::unimplemented());\n" - " return null;\n" - "}\n\n"; - } else if (method->server_streaming()) { - method_template = - " * @param \\$input_type_id$ $$request client request\n" - " * @param \\Grpc\\ServerCallWriter $$writer write response data of " - "\\$output_type_id$\n" - " * @param \\Grpc\\ServerContext $$context server request context\n" - " * @return void\n" - " */\n" - "public function $method_name$(\n" - " \\$input_type_id$ $$request,\n" - " \\Grpc\\ServerCallWriter $$writer,\n" - " \\Grpc\\ServerContext $$context\n" - "): void {\n" - " $$context->setStatus(\\Grpc\\Status::unimplemented());\n" - " $$writer->finish();\n" - "}\n\n"; - } else { - method_template = - " * @param \\$input_type_id$ $$request client request\n" - " * @param \\Grpc\\ServerContext $$context server request context\n" - " * @return \\$output_type_id$ for response data, null if if error " - "occured\n" - " * initial metadata (if any) and status (if not ok) should be set " - "to $$context\n" - " */\n" - "public function $method_name$(\n" - " \\$input_type_id$ $$request,\n" - " \\Grpc\\ServerContext $$context\n" - "): ?\\$output_type_id$ {\n" - " $$context->setStatus(\\Grpc\\Status::unimplemented());\n" - " return null;\n" - "}\n\n"; - } - out->Print(vars, method_template); -} - -void PrintServerMethodDescriptors(const ServiceDescriptor* service, - Printer* out) { - map vars; - vars["service_name"] = service->full_name(); - - out->Print("/**\n"); - if (service->options().deprecated()) { - out->Print(" * @deprecated\n"); - } - out->Print( - " * Get the method descriptors of the service for server registration\n" - " *\n" - " * @return array of \\Grpc\\MethodDescriptor for the service methods\n" - " */\n" - "public final function getMethodDescriptors(): array\n{\n"); - out->Indent(); - out->Indent(); - out->Print("return [\n"); - out->Indent(); - out->Indent(); - for (int i = 0; i < service->method_count(); i++) { - auto method = service->method(i); - auto input_type = method->input_type(); - vars["method_name"] = method->name(); - vars["input_type_id"] = MessageIdentifierName( - GeneratedClassName(input_type), input_type->file()); - if (method->client_streaming() && method->server_streaming()) { - vars["call_type"] = "BIDI_STREAMING_CALL"; - } else if (method->client_streaming()) { - vars["call_type"] = "CLIENT_STREAMING_CALL"; - } else if (method->server_streaming()) { - vars["call_type"] = "SERVER_STREAMING_CALL"; - } else { - vars["call_type"] = "UNARY_CALL"; - } - out->Print( - vars, - "'/$service_name$/$method_name$' => new \\Grpc\\MethodDescriptor(\n" - " $$this,\n" - " '$method_name$',\n" - " '\\$input_type_id$',\n" - " \\Grpc\\MethodDescriptor::$call_type$\n" - "),\n"); - } - out->Outdent(); - out->Outdent(); - out->Print("];\n"); - out->Outdent(); - out->Outdent(); - out->Print("}\n\n"); -} - -// Prints out the service descriptor object -void PrintService(const ServiceDescriptor* service, - const std::string& class_suffix, bool is_server, - Printer* out) { - map vars; - out->Print("/**\n"); - if (service->options().deprecated()) { - out->Print(" * @deprecated\n"); - } - out->Print(GetPHPComments(service, " *").c_str()); - out->Print(" */\n"); - vars["name"] = GetPHPServiceClassname(service, class_suffix, is_server); - vars["extends"] = is_server ? "" : "extends \\Grpc\\BaseStub "; - out->Print(vars, "class $name$ $extends${\n\n"); - out->Indent(); - out->Indent(); - if (!is_server) { - out->Print( - "/**\n * @param string $$hostname hostname\n" - " * @param array $$opts channel options\n" - " * @param \\Grpc\\Channel $$channel (optional) re-use channel object\n" - " */\n" - "public function __construct($$hostname, $$opts, " - "$$channel = null) {\n"); - out->Indent(); - out->Indent(); - out->Print("parent::__construct($$hostname, $$opts, $$channel);\n"); - out->Outdent(); - out->Outdent(); - out->Print("}\n\n"); - } - for (int i = 0; i < service->method_count(); i++) { - if (is_server) { - PrintServerMethod(service->method(i), out); - } else { - PrintMethod(service->method(i), out); - } - } - if (is_server) { - PrintServerMethodDescriptors(service, out); - } - out->Outdent(); - out->Outdent(); - out->Print("}\n"); -} -} // namespace - -std::string GenerateFile(const FileDescriptor* file, - const ServiceDescriptor* service, - const std::string& class_suffix, bool is_server) { - std::string output; - { - StringOutputStream output_stream(&output); - Printer out(&output_stream, '$'); - - out.Print(" vars; - std::string php_namespace = PackageName(file); - vars["package"] = php_namespace; - out.Print(vars, "namespace $package$;\n\n"); - - PrintService(service, class_suffix, is_server, &out); - } - return output; -} - -} // namespace grpc_php_generator diff --git a/deps/grpc/src/compiler/php_generator.h b/deps/grpc/src/compiler/php_generator.h deleted file mode 100644 index f775c8f2ca..0000000000 --- a/deps/grpc/src/compiler/php_generator.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PHP_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_PHP_GENERATOR_H - -#include "src/compiler/config.h" - -namespace grpc_php_generator { - -std::string GenerateFile(const grpc::protobuf::FileDescriptor* file, - const grpc::protobuf::ServiceDescriptor* service, - const std::string& class_suffix, - bool is_server = false); - -} // namespace grpc_php_generator - -#endif // GRPC_INTERNAL_COMPILER_PHP_GENERATOR_H diff --git a/deps/grpc/src/compiler/php_generator_helpers.h b/deps/grpc/src/compiler/php_generator_helpers.h deleted file mode 100644 index 9ae69682d8..0000000000 --- a/deps/grpc/src/compiler/php_generator_helpers.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PHP_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_PHP_GENERATOR_HELPERS_H - -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" - -namespace grpc_php_generator { - -inline std::string GetPHPServiceClassname( - const grpc::protobuf::ServiceDescriptor* service, - const std::string& class_suffix, bool is_server) { - return service->name() + - (class_suffix == "" ? (is_server ? "" : "Client") : class_suffix) + - (is_server ? "Stub" : ""); -} - -// ReplaceAll replaces all instances of search with replace in s. -inline std::string ReplaceAll(std::string s, const std::string& search, - const std::string& replace) { - size_t pos = 0; - while ((pos = s.find(search, pos)) != std::string::npos) { - s.replace(pos, search.length(), replace); - pos += replace.length(); - } - return s; -} - -inline std::string GetPHPServiceFilename( - const grpc::protobuf::FileDescriptor* file, - const grpc::protobuf::ServiceDescriptor* service, - const std::string& class_suffix, bool is_server) { - std::ostringstream oss; - if (file->options().has_php_namespace()) { - oss << ReplaceAll(file->options().php_namespace(), "\\", "/"); - } else { - std::vector tokens = - grpc_generator::tokenize(file->package(), "."); - for (unsigned int i = 0; i < tokens.size(); i++) { - oss << (i == 0 ? "" : "/") - << grpc_generator::CapitalizeFirstLetter(tokens[i]); - } - } - std::string path = oss.str(); - if (!path.empty()) path += "/"; - path += GetPHPServiceClassname(service, class_suffix, is_server) + ".php"; - return path; -} - -// Get leading or trailing comments in a string. Comment lines start with "// ". -// Leading detached comments are put in front of leading comments. -template -inline std::string GetPHPComments(const DescriptorType* desc, - std::string prefix) { - return ReplaceAll(grpc_generator::GetPrefixedComments(desc, true, prefix), - "*/", "*/"); -} - -} // namespace grpc_php_generator - -#endif // GRPC_INTERNAL_COMPILER_PHP_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/php_plugin.cc b/deps/grpc/src/compiler/php_plugin.cc deleted file mode 100644 index 9fafe52678..0000000000 --- a/deps/grpc/src/compiler/php_plugin.cc +++ /dev/null @@ -1,109 +0,0 @@ -/* - * - * Copyright 2016 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates PHP gRPC service interface out of Protobuf IDL. - -#include - -#include "src/compiler/config.h" -#include "src/compiler/php_generator.h" -#include "src/compiler/php_generator_helpers.h" - -using google::protobuf::compiler::ParseGeneratorParameter; -using grpc_php_generator::GenerateFile; -using grpc_php_generator::GetPHPServiceFilename; - -class PHPGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - PHPGrpcGenerator() {} - ~PHPGrpcGenerator() {} - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } - -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* error) const override { - if (file->service_count() == 0) { - return true; - } - - std::vector > options; - ParseGeneratorParameter(parameter, &options); - - bool generate_server = false; - std::string class_suffix; - for (size_t i = 0; i < options.size(); ++i) { - if (options[i].first == "class_suffix") { - class_suffix = options[i].second; - } else if (options[i].first == "generate_server") { - generate_server = true; - } else { - *error = "unsupported options: " + options[i].first; - return false; - } - } - - for (int i = 0; i < file->service_count(); i++) { - GenerateService(file, file->service(i), class_suffix, false, context); - if (generate_server) { - GenerateService(file, file->service(i), class_suffix, true, context); - } - } - - return true; - } - - private: - void GenerateService( - const grpc::protobuf::FileDescriptor* file, - const grpc::protobuf::ServiceDescriptor* service, - const std::string& class_suffix, bool is_server, - grpc::protobuf::compiler::GeneratorContext* context) const { - std::string code = GenerateFile(file, service, class_suffix, is_server); - - // Get output file name - std::string file_name = - GetPHPServiceFilename(file, service, class_suffix, is_server); - - std::unique_ptr output( - context->Open(file_name)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - } -}; - -int main(int argc, char* argv[]) { - PHPGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/proto_parser_helper.cc b/deps/grpc/src/compiler/proto_parser_helper.cc deleted file mode 100644 index b0943398a0..0000000000 --- a/deps/grpc/src/compiler/proto_parser_helper.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2023 The gRPC Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -namespace grpc_generator { - -std::string EscapeVariableDelimiters(const std::string& original) { - std::string mut_str = original; - size_t index = 0; - while ((index = mut_str.find('$', index)) != std::string::npos) { - mut_str.replace(index, 1, "$$"); - index += 2; - } - return mut_str; -} - -} // namespace grpc_generator diff --git a/deps/grpc/src/compiler/proto_parser_helper.h b/deps/grpc/src/compiler/proto_parser_helper.h deleted file mode 100644 index 8177546c7c..0000000000 --- a/deps/grpc/src/compiler/proto_parser_helper.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 The gRPC Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -namespace grpc_generator { - -// Replaces '$' with "$$", useful in proto comments. -std::string EscapeVariableDelimiters(const std::string& original); - -} // namespace grpc_generator diff --git a/deps/grpc/src/compiler/protobuf_plugin.h b/deps/grpc/src/compiler/protobuf_plugin.h deleted file mode 100644 index 0a7aa4141c..0000000000 --- a/deps/grpc/src/compiler/protobuf_plugin.h +++ /dev/null @@ -1,206 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PROTOBUF_PLUGIN_H -#define GRPC_INTERNAL_COMPILER_PROTOBUF_PLUGIN_H - -#include - -#include "src/compiler/config.h" -#include "src/compiler/cpp_generator_helpers.h" -#include "src/compiler/python_generator_helpers.h" -#include "src/compiler/python_private_generator.h" -#include "src/compiler/schema_interface.h" - -// Get leading or trailing comments in a string. -template -inline std::string GetCommentsHelper(const DescriptorType* desc, bool leading, - const std::string& prefix) { - return grpc_generator::GetPrefixedComments(desc, leading, prefix); -} - -class ProtoBufMethod : public grpc_generator::Method { - public: - ProtoBufMethod(const grpc::protobuf::MethodDescriptor* method) - : method_(method) {} - - std::string name() const { return method_->name(); } - - std::string input_type_name() const { - return grpc_cpp_generator::ClassName(method_->input_type(), true); - } - std::string output_type_name() const { - return grpc_cpp_generator::ClassName(method_->output_type(), true); - } - - std::string get_input_type_name() const { - return method_->input_type()->file()->name(); - } - std::string get_output_type_name() const { - return method_->output_type()->file()->name(); - } - - // TODO(https://github.com/grpc/grpc/issues/18800): Clean this up. - bool get_module_and_message_path_input( - std::string* str, std::string generator_file_name, - bool generate_in_pb2_grpc, std::string import_prefix, - const std::vector& prefixes_to_filter) const final { - return grpc_python_generator::GetModuleAndMessagePath( - method_->input_type(), str, generator_file_name, generate_in_pb2_grpc, - import_prefix, prefixes_to_filter); - } - - bool get_module_and_message_path_output( - std::string* str, std::string generator_file_name, - bool generate_in_pb2_grpc, std::string import_prefix, - const std::vector& prefixes_to_filter) const final { - return grpc_python_generator::GetModuleAndMessagePath( - method_->output_type(), str, generator_file_name, generate_in_pb2_grpc, - import_prefix, prefixes_to_filter); - } - - bool NoStreaming() const { - return !method_->client_streaming() && !method_->server_streaming(); - } - - bool ClientStreaming() const { return method_->client_streaming(); } - - bool ServerStreaming() const { return method_->server_streaming(); } - - bool BidiStreaming() const { - return method_->client_streaming() && method_->server_streaming(); - } - - std::string GetLeadingComments(const std::string prefix) const { - return GetCommentsHelper(method_, true, prefix); - } - - std::string GetTrailingComments(const std::string prefix) const { - return GetCommentsHelper(method_, false, prefix); - } - - vector GetAllComments() const { - return grpc_python_generator::get_all_comments(method_); - } - - private: - const grpc::protobuf::MethodDescriptor* method_; -}; - -class ProtoBufService : public grpc_generator::Service { - public: - ProtoBufService(const grpc::protobuf::ServiceDescriptor* service) - : service_(service) {} - - std::string name() const { return service_->name(); } - - int method_count() const { return service_->method_count(); } - std::unique_ptr method(int i) const { - return std::unique_ptr( - new ProtoBufMethod(service_->method(i))); - } - - std::string GetLeadingComments(const std::string prefix) const { - return GetCommentsHelper(service_, true, prefix); - } - - std::string GetTrailingComments(const std::string prefix) const { - return GetCommentsHelper(service_, false, prefix); - } - - vector GetAllComments() const { - return grpc_python_generator::get_all_comments(service_); - } - - private: - const grpc::protobuf::ServiceDescriptor* service_; -}; - -class ProtoBufPrinter : public grpc_generator::Printer { - public: - ProtoBufPrinter(std::string* str) - : output_stream_(str), printer_(&output_stream_, '$') {} - - void Print(const std::map& vars, - const char* string_template) { - printer_.Print(vars, string_template); - } - - void Print(const char* string) { printer_.Print(string); } - void PrintRaw(const char* string) { printer_.PrintRaw(string); } - void Indent() { printer_.Indent(); } - void Outdent() { printer_.Outdent(); } - - private: - grpc::protobuf::io::StringOutputStream output_stream_; - grpc::protobuf::io::Printer printer_; -}; - -class ProtoBufFile : public grpc_generator::File { - public: - ProtoBufFile(const grpc::protobuf::FileDescriptor* file) : file_(file) {} - - std::string filename() const { return file_->name(); } - std::string filename_without_ext() const { - return grpc_generator::StripProto(filename()); - } - - std::string package() const { return file_->package(); } - std::vector package_parts() const { - return grpc_generator::tokenize(package(), "."); - } - - std::string additional_headers() const { return ""; } - - int service_count() const { return file_->service_count(); } - std::unique_ptr service(int i) const { - return std::unique_ptr( - new ProtoBufService(file_->service(i))); - } - - std::unique_ptr CreatePrinter( - std::string* str) const { - return std::unique_ptr(new ProtoBufPrinter(str)); - } - - std::string GetLeadingComments(const std::string prefix) const { - return GetCommentsHelper(file_, true, prefix); - } - - std::string GetTrailingComments(const std::string prefix) const { - return GetCommentsHelper(file_, false, prefix); - } - - vector GetAllComments() const { - return grpc_python_generator::get_all_comments(file_); - } - - vector GetImportNames() const { - vector proto_names; - for (int i = 0; i < file_->dependency_count(); ++i) { - const auto& dep = *file_->dependency(i); - proto_names.push_back(dep.name()); - } - return proto_names; - } - - private: - const grpc::protobuf::FileDescriptor* file_; -}; - -#endif // GRPC_INTERNAL_COMPILER_PROTOBUF_PLUGIN_H diff --git a/deps/grpc/src/compiler/python_generator.cc b/deps/grpc/src/compiler/python_generator.cc deleted file mode 100644 index 11bc2c5cec..0000000000 --- a/deps/grpc/src/compiler/python_generator.cc +++ /dev/null @@ -1,989 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/python_generator.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/protobuf_plugin.h" -#include "src/compiler/python_generator_helpers.h" -#include "src/compiler/python_private_generator.h" - -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::compiler::GeneratorContext; -using grpc::protobuf::io::CodedOutputStream; -using grpc::protobuf::io::ZeroCopyOutputStream; -using std::make_pair; -using std::map; -using std::pair; -using std::replace; -using std::set; -using std::tuple; -using std::vector; - -namespace grpc_python_generator { - -std::string generator_file_name; - -namespace { - -typedef map StringMap; -typedef vector StringVector; -typedef tuple StringPair; -typedef set StringPairSet; - -// Provides RAII indentation handling. Use as: -// { -// IndentScope raii_my_indent_var_name_here(my_py_printer); -// // constructor indented my_py_printer -// ... -// // destructor called at end of scope, un-indenting my_py_printer -// } -class IndentScope { - public: - explicit IndentScope(grpc_generator::Printer* printer) : printer_(printer) { - // NOTE(rbellevi): Two-space tabs are hard-coded in the protocol compiler. - // Doubling our indents and outdents guarantees compliance with PEP8. - printer_->Indent(); - printer_->Indent(); - } - - ~IndentScope() { - printer_->Outdent(); - printer_->Outdent(); - } - - private: - grpc_generator::Printer* printer_; -}; - -PrivateGenerator::PrivateGenerator(const GeneratorConfiguration& config, - const grpc_generator::File* file) - : config(config), file(file) {} - -void PrivateGenerator::PrintAllComments(StringVector comments, - grpc_generator::Printer* out) { - if (comments.empty()) { - // Python requires code structures like class and def to have - // a body, even if it is just "pass" or a docstring. We need - // to ensure not to generate empty bodies. We could do something - // smarter and more sophisticated, but at the moment, if there is - // no docstring to print, we simply emit "pass" to ensure validity - // of the generated code. - out->Print( - "\"\"\"Missing associated documentation comment in .proto " - "file.\"\"\"\n"); - return; - } - out->Print("\"\"\""); - for (StringVector::iterator it = comments.begin(); it != comments.end(); - ++it) { - size_t start_pos = it->find_first_not_of(' '); - if (start_pos != std::string::npos) { - out->PrintRaw(it->c_str() + start_pos); - } - out->Print("\n"); - } - out->Print("\"\"\"\n"); -} - -bool PrivateGenerator::PrintBetaServicer(const grpc_generator::Service* service, - grpc_generator::Printer* out) { - StringMap service_dict; - service_dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(service_dict, "class Beta$Service$Servicer(object):\n"); - { - IndentScope raii_class_indent(out); - out->Print( - "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n" - "\nIt is recommended to use the GA API (classes and functions in this\n" - "file not marked beta) for all further purposes. This class was " - "generated\n" - "only to ease transition from grpcio<0.15.0 to " - "grpcio>=0.15.0.\"\"\"\n"); - StringVector service_comments = service->GetAllComments(); - PrintAllComments(service_comments, out); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - std::string arg_name = - method->ClientStreaming() ? "request_iterator" : "request"; - StringMap method_dict; - method_dict["Method"] = method->name(); - method_dict["ArgName"] = arg_name; - out->Print(method_dict, "def $Method$(self, $ArgName$, context):\n"); - { - IndentScope raii_method_indent(out); - StringVector method_comments = method->GetAllComments(); - PrintAllComments(method_comments, out); - out->Print("context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)\n"); - } - } - } - return true; -} - -bool PrivateGenerator::PrintBetaStub(const grpc_generator::Service* service, - grpc_generator::Printer* out) { - StringMap service_dict; - service_dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(service_dict, "class Beta$Service$Stub(object):\n"); - { - IndentScope raii_class_indent(out); - out->Print( - "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n" - "\nIt is recommended to use the GA API (classes and functions in this\n" - "file not marked beta) for all further purposes. This class was " - "generated\n" - "only to ease transition from grpcio<0.15.0 to " - "grpcio>=0.15.0.\"\"\"\n"); - StringVector service_comments = service->GetAllComments(); - PrintAllComments(service_comments, out); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - std::string arg_name = - method->ClientStreaming() ? "request_iterator" : "request"; - StringMap method_dict; - method_dict["Method"] = method->name(); - method_dict["ArgName"] = arg_name; - out->Print(method_dict, - "def $Method$(self, $ArgName$, timeout, metadata=None, " - "with_call=False, protocol_options=None):\n"); - { - IndentScope raii_method_indent(out); - StringVector method_comments = method->GetAllComments(); - PrintAllComments(method_comments, out); - out->Print("raise NotImplementedError()\n"); - } - if (!method->ServerStreaming()) { - out->Print(method_dict, "$Method$.future = None\n"); - } - } - } - return true; -} - -bool PrivateGenerator::PrintBetaServerFactory( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out) { - StringMap service_dict; - service_dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(service_dict, - "def beta_create_$Service$_server(servicer, pool=None, " - "pool_size=None, default_timeout=None, maximum_timeout=None):\n"); - { - IndentScope raii_create_server_indent(out); - out->Print( - "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n" - "\nIt is recommended to use the GA API (classes and functions in this\n" - "file not marked beta) for all further purposes. This function was\n" - "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0" - "\"\"\"\n"); - StringMap method_implementation_constructors; - StringMap input_message_modules_and_classes; - StringMap output_message_modules_and_classes; - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - const std::string method_implementation_constructor = - std::string(method->ClientStreaming() ? "stream_" : "unary_") + - std::string(method->ServerStreaming() ? "stream_" : "unary_") + - "inline"; - std::string input_message_module_and_class; - if (!method->get_module_and_message_path_input( - &input_message_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - std::string output_message_module_and_class; - if (!method->get_module_and_message_path_output( - &output_message_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - method_implementation_constructors.insert( - make_pair(method->name(), method_implementation_constructor)); - input_message_modules_and_classes.insert( - make_pair(method->name(), input_message_module_and_class)); - output_message_modules_and_classes.insert( - make_pair(method->name(), output_message_module_and_class)); - } - StringMap method_dict; - method_dict["PackageQualifiedServiceName"] = package_qualified_service_name; - out->Print("request_deserializers = {\n"); - for (StringMap::iterator name_and_input_module_class_pair = - input_message_modules_and_classes.begin(); - name_and_input_module_class_pair != - input_message_modules_and_classes.end(); - name_and_input_module_class_pair++) { - method_dict["MethodName"] = name_and_input_module_class_pair->first; - method_dict["InputTypeModuleAndClass"] = - name_and_input_module_class_pair->second; - IndentScope raii_indent(out); - out->Print(method_dict, - "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): " - "$InputTypeModuleAndClass$.FromString,\n"); - } - out->Print("}\n"); - out->Print("response_serializers = {\n"); - for (StringMap::iterator name_and_output_module_class_pair = - output_message_modules_and_classes.begin(); - name_and_output_module_class_pair != - output_message_modules_and_classes.end(); - name_and_output_module_class_pair++) { - method_dict["MethodName"] = name_and_output_module_class_pair->first; - method_dict["OutputTypeModuleAndClass"] = - name_and_output_module_class_pair->second; - IndentScope raii_indent(out); - out->Print(method_dict, - "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): " - "$OutputTypeModuleAndClass$.SerializeToString,\n"); - } - out->Print("}\n"); - out->Print("method_implementations = {\n"); - for (StringMap::iterator name_and_implementation_constructor = - method_implementation_constructors.begin(); - name_and_implementation_constructor != - method_implementation_constructors.end(); - name_and_implementation_constructor++) { - method_dict["Method"] = name_and_implementation_constructor->first; - method_dict["Constructor"] = name_and_implementation_constructor->second; - IndentScope raii_descriptions_indent(out); - const std::string method_name = - name_and_implementation_constructor->first; - out->Print(method_dict, - "(\'$PackageQualifiedServiceName$\', \'$Method$\'): " - "face_utilities.$Constructor$(servicer.$Method$),\n"); - } - out->Print("}\n"); - out->Print( - "server_options = beta_implementations.server_options(" - "request_deserializers=request_deserializers, " - "response_serializers=response_serializers, " - "thread_pool=pool, thread_pool_size=pool_size, " - "default_timeout=default_timeout, " - "maximum_timeout=maximum_timeout)\n"); - out->Print( - "return beta_implementations.server(method_implementations, " - "options=server_options)\n"); - } - return true; -} - -bool PrivateGenerator::PrintBetaStubFactory( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out) { - StringMap dict; - dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(dict, - "def beta_create_$Service$_stub(channel, host=None," - " metadata_transformer=None, pool=None, pool_size=None):\n"); - { - IndentScope raii_create_server_indent(out); - out->Print( - "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n" - "\nIt is recommended to use the GA API (classes and functions in this\n" - "file not marked beta) for all further purposes. This function was\n" - "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0" - "\"\"\"\n"); - StringMap method_cardinalities; - StringMap input_message_modules_and_classes; - StringMap output_message_modules_and_classes; - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - const std::string method_cardinality = - std::string(method->ClientStreaming() ? "STREAM" : "UNARY") + "_" + - std::string(method->ServerStreaming() ? "STREAM" : "UNARY"); - std::string input_message_module_and_class; - if (!method->get_module_and_message_path_input( - &input_message_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - std::string output_message_module_and_class; - if (!method->get_module_and_message_path_output( - &output_message_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - method_cardinalities.insert( - make_pair(method->name(), method_cardinality)); - input_message_modules_and_classes.insert( - make_pair(method->name(), input_message_module_and_class)); - output_message_modules_and_classes.insert( - make_pair(method->name(), output_message_module_and_class)); - } - StringMap method_dict; - method_dict["PackageQualifiedServiceName"] = package_qualified_service_name; - out->Print("request_serializers = {\n"); - for (StringMap::iterator name_and_input_module_class_pair = - input_message_modules_and_classes.begin(); - name_and_input_module_class_pair != - input_message_modules_and_classes.end(); - name_and_input_module_class_pair++) { - method_dict["MethodName"] = name_and_input_module_class_pair->first; - method_dict["InputTypeModuleAndClass"] = - name_and_input_module_class_pair->second; - IndentScope raii_indent(out); - out->Print(method_dict, - "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): " - "$InputTypeModuleAndClass$.SerializeToString,\n"); - } - out->Print("}\n"); - out->Print("response_deserializers = {\n"); - for (StringMap::iterator name_and_output_module_class_pair = - output_message_modules_and_classes.begin(); - name_and_output_module_class_pair != - output_message_modules_and_classes.end(); - name_and_output_module_class_pair++) { - method_dict["MethodName"] = name_and_output_module_class_pair->first; - method_dict["OutputTypeModuleAndClass"] = - name_and_output_module_class_pair->second; - IndentScope raii_indent(out); - out->Print(method_dict, - "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): " - "$OutputTypeModuleAndClass$.FromString,\n"); - } - out->Print("}\n"); - out->Print("cardinalities = {\n"); - for (StringMap::iterator name_and_cardinality = - method_cardinalities.begin(); - name_and_cardinality != method_cardinalities.end(); - name_and_cardinality++) { - method_dict["Method"] = name_and_cardinality->first; - method_dict["Cardinality"] = name_and_cardinality->second; - IndentScope raii_descriptions_indent(out); - out->Print(method_dict, - "\'$Method$\': cardinality.Cardinality.$Cardinality$,\n"); - } - out->Print("}\n"); - out->Print( - "stub_options = beta_implementations.stub_options(" - "host=host, metadata_transformer=metadata_transformer, " - "request_serializers=request_serializers, " - "response_deserializers=response_deserializers, " - "thread_pool=pool, thread_pool_size=pool_size)\n"); - out->Print(method_dict, - "return beta_implementations.dynamic_stub(channel, " - "\'$PackageQualifiedServiceName$\', " - "cardinalities, options=stub_options)\n"); - } - return true; -} - -bool PrivateGenerator::PrintStub( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out) { - StringMap dict; - dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(dict, "class $Service$Stub(object):\n"); - { - IndentScope raii_class_indent(out); - StringVector service_comments = service->GetAllComments(); - PrintAllComments(service_comments, out); - out->Print("\n"); - out->Print("def __init__(self, channel):\n"); - { - IndentScope raii_init_indent(out); - out->Print("\"\"\"Constructor.\n"); - out->Print("\n"); - out->Print("Args:\n"); - { - IndentScope raii_args_indent(out); - out->Print("channel: A grpc.Channel.\n"); - } - out->Print("\"\"\"\n"); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - std::string multi_callable_constructor = - std::string(method->ClientStreaming() ? "stream" : "unary") + "_" + - std::string(method->ServerStreaming() ? "stream" : "unary"); - std::string request_module_and_class; - if (!method->get_module_and_message_path_input( - &request_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - std::string response_module_and_class; - if (!method->get_module_and_message_path_output( - &response_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - StringMap method_dict; - method_dict["Method"] = method->name(); - method_dict["MultiCallableConstructor"] = multi_callable_constructor; - out->Print(method_dict, - "self.$Method$ = channel.$MultiCallableConstructor$(\n"); - { - method_dict["PackageQualifiedService"] = - package_qualified_service_name; - method_dict["RequestModuleAndClass"] = request_module_and_class; - method_dict["ResponseModuleAndClass"] = response_module_and_class; - IndentScope raii_first_attribute_indent(out); - IndentScope raii_second_attribute_indent(out); - out->Print(method_dict, "'/$PackageQualifiedService$/$Method$',\n"); - out->Print(method_dict, - "request_serializer=$RequestModuleAndClass$." - "SerializeToString,\n"); - out->Print( - method_dict, - "response_deserializer=$ResponseModuleAndClass$.FromString,\n"); - out->Print("_registered_method=True)\n"); - } - } - } - } - return true; -} - -bool PrivateGenerator::PrintServicer(const grpc_generator::Service* service, - grpc_generator::Printer* out) { - StringMap service_dict; - service_dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(service_dict, "class $Service$Servicer(object):\n"); - { - IndentScope raii_class_indent(out); - StringVector service_comments = service->GetAllComments(); - PrintAllComments(service_comments, out); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - std::string arg_name = - method->ClientStreaming() ? "request_iterator" : "request"; - StringMap method_dict; - method_dict["Method"] = method->name(); - method_dict["ArgName"] = arg_name; - out->Print("\n"); - out->Print(method_dict, "def $Method$(self, $ArgName$, context):\n"); - { - IndentScope raii_method_indent(out); - StringVector method_comments = method->GetAllComments(); - PrintAllComments(method_comments, out); - out->Print("context.set_code(grpc.StatusCode.UNIMPLEMENTED)\n"); - out->Print("context.set_details('Method not implemented!')\n"); - out->Print("raise NotImplementedError('Method not implemented!')\n"); - } - } - } - return true; -} - -bool PrivateGenerator::PrintAddServicerToServer( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out) { - StringMap service_dict; - service_dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(service_dict, - "def add_$Service$Servicer_to_server(servicer, server):\n"); - { - IndentScope raii_class_indent(out); - out->Print("rpc_method_handlers = {\n"); - { - IndentScope raii_dict_first_indent(out); - IndentScope raii_dict_second_indent(out); - for (int i = 0; i < service->method_count(); ++i) { - auto method = service->method(i); - std::string method_handler_constructor = - std::string(method->ClientStreaming() ? "stream" : "unary") + "_" + - std::string(method->ServerStreaming() ? "stream" : "unary") + - "_rpc_method_handler"; - std::string request_module_and_class; - if (!method->get_module_and_message_path_input( - &request_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - std::string response_module_and_class; - if (!method->get_module_and_message_path_output( - &response_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - StringMap method_dict; - method_dict["Method"] = method->name(); - method_dict["MethodHandlerConstructor"] = method_handler_constructor; - method_dict["RequestModuleAndClass"] = request_module_and_class; - method_dict["ResponseModuleAndClass"] = response_module_and_class; - out->Print(method_dict, - "'$Method$': grpc.$MethodHandlerConstructor$(\n"); - { - IndentScope raii_call_first_indent(out); - IndentScope raii_call_second_indent(out); - out->Print(method_dict, "servicer.$Method$,\n"); - out->Print( - method_dict, - "request_deserializer=$RequestModuleAndClass$.FromString,\n"); - out->Print( - method_dict, - "response_serializer=$ResponseModuleAndClass$.SerializeToString," - "\n"); - } - out->Print("),\n"); - } - } - StringMap method_dict; - method_dict["PackageQualifiedServiceName"] = package_qualified_service_name; - out->Print("}\n"); - out->Print("generic_handler = grpc.method_handlers_generic_handler(\n"); - { - IndentScope raii_call_first_indent(out); - IndentScope raii_call_second_indent(out); - out->Print(method_dict, - "'$PackageQualifiedServiceName$', rpc_method_handlers)\n"); - } - out->Print("server.add_generic_rpc_handlers((generic_handler,))\n"); - out->Print(method_dict, - "server.add_registered_method_handlers('$" - "PackageQualifiedServiceName$', rpc_method_handlers)\n"); - } - return true; -} - -/* Prints out a service class used as a container for static methods pertaining - * to a class. This class has the exact name of service written in the ".proto" - * file, with no suffixes. Since this class merely acts as a namespace, it - * should never be instantiated. - */ -bool PrivateGenerator::PrintServiceClass( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out) { - StringMap dict; - dict["Service"] = service->name(); - out->Print("\n\n"); - out->Print(" # This class is part of an EXPERIMENTAL API.\n"); - out->Print(dict, "class $Service$(object):\n"); - { - IndentScope class_indent(out); - StringVector service_comments = service->GetAllComments(); - PrintAllComments(service_comments, out); - for (int i = 0; i < service->method_count(); ++i) { - const auto& method = service->method(i); - std::string request_module_and_class; - if (!method->get_module_and_message_path_input( - &request_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - std::string response_module_and_class; - if (!method->get_module_and_message_path_output( - &response_module_and_class, generator_file_name, - generate_in_pb2_grpc, config.import_prefix, - config.prefixes_to_filter)) { - return false; - } - out->Print("\n"); - StringMap method_dict; - method_dict["Method"] = method->name(); - out->Print("@staticmethod\n"); - out->Print(method_dict, "def $Method$("); - std::string request_parameter( - method->ClientStreaming() ? "request_iterator" : "request"); - StringMap args_dict; - args_dict["RequestParameter"] = request_parameter; - { - IndentScope args_indent(out); - IndentScope args_double_indent(out); - out->Print(args_dict, "$RequestParameter$,\n"); - out->Print("target,\n"); - out->Print("options=(),\n"); - out->Print("channel_credentials=None,\n"); - out->Print("call_credentials=None,\n"); - out->Print("insecure=False,\n"); - out->Print("compression=None,\n"); - out->Print("wait_for_ready=None,\n"); - out->Print("timeout=None,\n"); - out->Print("metadata=None):\n"); - } - { - IndentScope method_indent(out); - std::string arity_method_name = - std::string(method->ClientStreaming() ? "stream" : "unary") + "_" + - std::string(method->ServerStreaming() ? "stream" : "unary"); - args_dict["ArityMethodName"] = arity_method_name; - args_dict["PackageQualifiedService"] = package_qualified_service_name; - args_dict["Method"] = method->name(); - out->Print(args_dict, "return grpc.experimental.$ArityMethodName$(\n"); - { - IndentScope continuation_indent(out); - StringMap serializer_dict; - out->Print(args_dict, "$RequestParameter$,\n"); - out->Print("target,\n"); - out->Print(args_dict, "'/$PackageQualifiedService$/$Method$',\n"); - serializer_dict["RequestModuleAndClass"] = request_module_and_class; - serializer_dict["ResponseModuleAndClass"] = response_module_and_class; - out->Print(serializer_dict, - "$RequestModuleAndClass$.SerializeToString,\n"); - out->Print(serializer_dict, "$ResponseModuleAndClass$.FromString,\n"); - out->Print("options,\n"); - out->Print("channel_credentials,\n"); - out->Print("insecure,\n"); - out->Print("call_credentials,\n"); - out->Print("compression,\n"); - out->Print("wait_for_ready,\n"); - out->Print("timeout,\n"); - out->Print("metadata,\n"); - out->Print("_registered_method=True)\n"); - } - } - } - } - // TODO(rbellevi): Add methods pertinent to the server side as well. - return true; -} - -bool PrivateGenerator::PrintBetaPreamble(grpc_generator::Printer* out) { - StringMap var; - var["Package"] = config.beta_package_root; - out->Print(var, - "from $Package$ import implementations as beta_implementations\n"); - out->Print(var, "from $Package$ import interfaces as beta_interfaces\n"); - out->Print("from grpc.framework.common import cardinality\n"); - out->Print( - "from grpc.framework.interfaces.face import utilities as " - "face_utilities\n"); - return true; -} - -bool PrivateGenerator::PrintPreamble(grpc_generator::Printer* out) { - StringMap var; - var["Package"] = config.grpc_package_root; - out->Print(var, "import $Package$\n"); - if (config.grpc_tools_version.size() > 0) { - out->Print(var, "import warnings\n"); - } - if (generate_in_pb2_grpc) { - out->Print("\n"); - StringPairSet imports_set; - for (int i = 0; i < file->service_count(); ++i) { - auto service = file->service(i); - for (int j = 0; j < service->method_count(); ++j) { - auto method = service.get()->method(j); - - std::string input_type_file_name = method->get_input_type_name(); - std::string input_module_name = - ModuleName(input_type_file_name, config.import_prefix, - config.prefixes_to_filter); - std::string input_module_alias = - ModuleAlias(input_type_file_name, config.import_prefix, - config.prefixes_to_filter); - imports_set.insert( - std::make_tuple(input_module_name, input_module_alias)); - - std::string output_type_file_name = method->get_output_type_name(); - std::string output_module_name = - ModuleName(output_type_file_name, config.import_prefix, - config.prefixes_to_filter); - std::string output_module_alias = - ModuleAlias(output_type_file_name, config.import_prefix, - config.prefixes_to_filter); - imports_set.insert( - std::make_tuple(output_module_name, output_module_alias)); - } - } - - for (StringPairSet::iterator it = imports_set.begin(); - it != imports_set.end(); ++it) { - auto module_name = std::get<0>(*it); - var["ModuleAlias"] = std::get<1>(*it); - const size_t last_dot_pos = module_name.rfind('.'); - if (last_dot_pos == std::string::npos) { - var["ImportStatement"] = "import " + module_name; - } else { - var["ImportStatement"] = "from " + module_name.substr(0, last_dot_pos) + - " import " + - module_name.substr(last_dot_pos + 1); - } - out->Print(var, "$ImportStatement$ as $ModuleAlias$\n"); - } - - // Checks if generate code is used with a supported grpcio version. - if (config.grpc_tools_version.size() > 0) { - var["ToolsVersion"] = config.grpc_tools_version; - out->Print(var, "\nGRPC_GENERATED_VERSION = '$ToolsVersion$'\n"); - out->Print("GRPC_VERSION = grpc.__version__\n"); - out->Print("EXPECTED_ERROR_RELEASE = '1.66.0'\n"); - out->Print("SCHEDULED_RELEASE_DATE = 'August 6, 2024'\n"); - out->Print("_version_not_supported = False\n\n"); - out->Print("try:\n"); - { - IndentScope raii_import_indent(out); - out->Print( - "from grpc._utilities import first_version_is_lower\n" - "_version_not_supported = first_version_is_lower(GRPC_VERSION, " - "GRPC_GENERATED_VERSION)\n"); - } - out->Print("except ImportError:\n"); - { - IndentScope raii_import_error_indent(out); - out->Print("_version_not_supported = True\n"); - } - out->Print("\nif _version_not_supported:\n"); - { - IndentScope raii_warning_indent(out); - out->Print("warnings.warn(\n"); - { - IndentScope raii_warning_string_indent(out); - std::string filename_without_ext = file->filename_without_ext(); - std::replace(filename_without_ext.begin(), filename_without_ext.end(), - '-', '_'); - var["Pb2GrpcFileName"] = filename_without_ext; - out->Print( - var, - "f'The grpc package installed is at version {GRPC_VERSION},'\n" - "+ f' but the generated code in $Pb2GrpcFileName$_pb2_grpc.py " - "depends on'\n" - "+ f' grpcio>={GRPC_GENERATED_VERSION}.'\n" - "+ f' Please upgrade your grpc module to " - "grpcio>={GRPC_GENERATED_VERSION}'\n" - "+ f' or downgrade your generated code using " - "grpcio-tools<={GRPC_VERSION}.'\n" - "+ f' This warning will become an error in " - "{EXPECTED_ERROR_RELEASE},'\n" - "+ f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',\n" - "RuntimeWarning\n"); - } - out->Print(")\n"); - } - } - } - return true; -} - -bool PrivateGenerator::PrintGAServices(grpc_generator::Printer* out) { - std::string package = file->package(); - if (!package.empty()) { - package = package.append("."); - } - for (int i = 0; i < file->service_count(); ++i) { - auto service = file->service(i); - std::string package_qualified_service_name = package + service->name(); - if (!(PrintStub(package_qualified_service_name, service.get(), out) && - PrintServicer(service.get(), out) && - PrintAddServicerToServer(package_qualified_service_name, - service.get(), out) && - PrintServiceClass(package_qualified_service_name, service.get(), - out))) { - return false; - } - } - return true; -} - -bool PrivateGenerator::PrintBetaServices(grpc_generator::Printer* out) { - std::string package = file->package(); - if (!package.empty()) { - package = package.append("."); - } - for (int i = 0; i < file->service_count(); ++i) { - auto service = file->service(i); - std::string package_qualified_service_name = package + service->name(); - if (!(PrintBetaServicer(service.get(), out) && - PrintBetaStub(service.get(), out) && - PrintBetaServerFactory(package_qualified_service_name, service.get(), - out) && - PrintBetaStubFactory(package_qualified_service_name, service.get(), - out))) { - return false; - } - } - return true; -} - -pair PrivateGenerator::GetGrpcServices() { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - auto out = file->CreatePrinter(&output); - if (generate_in_pb2_grpc) { - out->Print( - "# Generated by the gRPC Python protocol compiler plugin. " - "DO NOT EDIT!\n\"\"\"" - "Client and server classes corresponding to protobuf-defined " - "services.\"\"\"\n"); - if (!PrintPreamble(out.get())) { - return make_pair(false, ""); - } - if (!PrintGAServices(out.get())) { - return make_pair(false, ""); - } - } else { - out->Print("try:\n"); - { - IndentScope raii_dict_try_indent(out.get()); - out->Print( - "# THESE ELEMENTS WILL BE DEPRECATED.\n" - "# Please use the generated *_pb2_grpc.py files instead.\n"); - if (!PrintPreamble(out.get())) { - return make_pair(false, ""); - } - if (!PrintBetaPreamble(out.get())) { - return make_pair(false, ""); - } - if (!PrintGAServices(out.get())) { - return make_pair(false, ""); - } - if (!PrintBetaServices(out.get())) { - return make_pair(false, ""); - } - } - out->Print("except ImportError:\n"); - { - IndentScope raii_dict_except_indent(out.get()); - out->Print("pass"); - } - } - } - return make_pair(true, std::move(output)); -} - -} // namespace - -GeneratorConfiguration::GeneratorConfiguration() - : grpc_package_root("grpc"), - beta_package_root("grpc.beta"), - import_prefix(""), - grpc_tools_version("") {} - -GeneratorConfiguration::GeneratorConfiguration(std::string version) - : grpc_package_root("grpc"), - beta_package_root("grpc.beta"), - import_prefix(""), - grpc_tools_version(version) {} - -PythonGrpcGenerator::PythonGrpcGenerator(const GeneratorConfiguration& config) - : config_(config) {} - -PythonGrpcGenerator::~PythonGrpcGenerator() {} - -static bool GenerateGrpc(GeneratorContext* context, PrivateGenerator& generator, - std::string file_name, bool generate_in_pb2_grpc) { - bool success; - std::unique_ptr output; - std::unique_ptr coded_output; - std::string grpc_code; - - if (generate_in_pb2_grpc) { - output.reset(context->Open(file_name)); - generator.generate_in_pb2_grpc = true; - } else { - output.reset(context->OpenForInsert(file_name, "module_scope")); - generator.generate_in_pb2_grpc = false; - } - - coded_output.reset(new CodedOutputStream(output.get())); - tie(success, grpc_code) = generator.GetGrpcServices(); - - if (success) { - coded_output->WriteRaw(grpc_code.data(), grpc_code.size()); - return true; - } else { - return false; - } -} - -static bool ParseParameters(const std::string& parameter, - std::string* grpc_version, - std::vector* strip_prefixes, - std::string* error) { - std::vector comma_delimited_parameters; - grpc_python_generator::Split(parameter, ',', &comma_delimited_parameters); - if (comma_delimited_parameters.size() == 1 && - comma_delimited_parameters[0].empty()) { - *grpc_version = "grpc_2_0"; - } else if (comma_delimited_parameters.size() == 1) { - *grpc_version = comma_delimited_parameters[0]; - } else if (comma_delimited_parameters.size() == 2) { - *grpc_version = comma_delimited_parameters[0]; - std::copy(comma_delimited_parameters.begin() + 1, - comma_delimited_parameters.end(), - std::back_inserter(*strip_prefixes)); - } else { - *error = "--grpc_python_out received too many comma-delimited parameters."; - return false; - } - return true; -} - -bool PythonGrpcGenerator::Generate(const FileDescriptor* file, - const std::string& parameter, - GeneratorContext* context, - std::string* error) const { - // Get output file name. - std::string pb2_file_name; - std::string pb2_grpc_file_name; - static const int proto_suffix_length = strlen(".proto"); - if (file->name().size() > static_cast(proto_suffix_length) && - file->name().find_last_of(".proto") == file->name().size() - 1) { - std::string base = - file->name().substr(0, file->name().size() - proto_suffix_length); - std::replace(base.begin(), base.end(), '-', '_'); - pb2_file_name = base + "_pb2.py"; - pb2_grpc_file_name = base + "_pb2_grpc.py"; - } else { - *error = "Invalid proto file name. Proto file must end with .proto"; - return false; - } - generator_file_name = file->name(); - - ProtoBufFile pbfile(file); - std::string grpc_version; - GeneratorConfiguration extended_config(config_); - bool success = ParseParameters(parameter, &grpc_version, - &(extended_config.prefixes_to_filter), error); - PrivateGenerator generator(extended_config, &pbfile); - if (!success) return false; - if (grpc_version == "grpc_2_0") { - return GenerateGrpc(context, generator, pb2_grpc_file_name, true); - } else if (grpc_version == "grpc_1_0") { - return GenerateGrpc(context, generator, pb2_grpc_file_name, true) && - GenerateGrpc(context, generator, pb2_file_name, false); - } else { - *error = "Invalid grpc version '" + grpc_version + "'."; - return false; - } -} - -} // namespace grpc_python_generator diff --git a/deps/grpc/src/compiler/python_generator.h b/deps/grpc/src/compiler/python_generator.h deleted file mode 100644 index 1ea0e0a096..0000000000 --- a/deps/grpc/src/compiler/python_generator.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H - -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/schema_interface.h" - -namespace grpc_python_generator { - -// Data pertaining to configuration of the generator with respect to anything -// that may be used internally at Google. -struct GeneratorConfiguration { - GeneratorConfiguration(); - GeneratorConfiguration(std::string version); - std::string grpc_package_root; - // TODO(https://github.com/grpc/grpc/issues/8622): Drop this. - std::string beta_package_root; - // TODO(https://github.com/protocolbuffers/protobuf/issues/888): Drop this. - std::string import_prefix; - std::string grpc_tools_version; - std::vector prefixes_to_filter; -}; - -class PythonGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - PythonGrpcGenerator(const GeneratorConfiguration& config); - ~PythonGrpcGenerator(); - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } - -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& parameter, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* error) const override; - - private: - GeneratorConfiguration config_; -}; - -} // namespace grpc_python_generator - -#endif // GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H diff --git a/deps/grpc/src/compiler/python_generator_helpers.h b/deps/grpc/src/compiler/python_generator_helpers.h deleted file mode 100644 index 8a5d745432..0000000000 --- a/deps/grpc/src/compiler/python_generator_helpers.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_HELPERS_H -#define GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_HELPERS_H - -#include -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/python_generator.h" -#include "src/compiler/python_private_generator.h" - -using grpc::protobuf::Descriptor; -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::MethodDescriptor; -using grpc::protobuf::ServiceDescriptor; -using grpc::protobuf::compiler::GeneratorContext; -using grpc::protobuf::io::CodedOutputStream; -using grpc::protobuf::io::Printer; -using grpc::protobuf::io::StringOutputStream; -using grpc::protobuf::io::ZeroCopyOutputStream; -using grpc_generator::StringReplace; -using grpc_generator::StripProto; -using std::vector; - -namespace grpc_python_generator { - -namespace { - -typedef vector DescriptorVector; -typedef vector StringVector; - -static std::string StripModulePrefixes( - const std::string& raw_module_name, - const std::vector& prefixes_to_filter) { - for (const auto& prefix : prefixes_to_filter) { - if (raw_module_name.rfind(prefix, 0) == 0) { - return raw_module_name.substr(prefix.size(), - raw_module_name.size() - prefix.size()); - } - } - return raw_module_name; -} - -// TODO(https://github.com/protocolbuffers/protobuf/issues/888): -// Export `ModuleName` from protobuf's -// `src/google/protobuf/compiler/python/python_generator.cc` file. -std::string ModuleName(const std::string& filename, - const std::string& import_prefix, - const std::vector& prefixes_to_filter) { - std::string basename = StripProto(filename); - basename = StringReplace(basename, "-", "_"); - basename = StringReplace(basename, "/", "."); - return StripModulePrefixes(import_prefix + basename + "_pb2", - prefixes_to_filter); -} - -// TODO(https://github.com/protocolbuffers/protobuf/issues/888): -// Export `ModuleAlias` from protobuf's -// `src/google/protobuf/compiler/python/python_generator.cc` file. -std::string ModuleAlias(const std::string& filename, - const std::string& import_prefix, - const std::vector& prefixes_to_filter) { - std::string module_name = - ModuleName(filename, import_prefix, prefixes_to_filter); - // We can't have dots in the module name, so we replace each with _dot_. - // But that could lead to a collision between a.b and a_dot_b, so we also - // duplicate each underscore. - module_name = StringReplace(module_name, "_", "__"); - module_name = StringReplace(module_name, ".", "_dot_"); - return module_name; -} - -bool GetModuleAndMessagePath( - const Descriptor* type, std::string* out, std::string generator_file_name, - bool generate_in_pb2_grpc, std::string& import_prefix, - const std::vector& prefixes_to_filter) { - const Descriptor* path_elem_type = type; - DescriptorVector message_path; - do { - message_path.push_back(path_elem_type); - path_elem_type = path_elem_type->containing_type(); - } while (path_elem_type); // implicit nullptr comparison; don't be explicit - std::string file_name = type->file()->name(); - static const int proto_suffix_length = strlen(".proto"); - if (!(file_name.size() > static_cast(proto_suffix_length) && - file_name.find_last_of(".proto") == file_name.size() - 1)) { - return false; - } - - std::string module; - if (generator_file_name != file_name || generate_in_pb2_grpc) { - module = ModuleAlias(file_name, import_prefix, prefixes_to_filter) + "."; - } else { - module = ""; - } - std::string message_type; - for (DescriptorVector::reverse_iterator path_iter = message_path.rbegin(); - path_iter != message_path.rend(); ++path_iter) { - message_type += (*path_iter)->name() + "."; - } - // no pop_back prior to C++11 - message_type.resize(message_type.size() - 1); - *out = module + message_type; - return true; -} - -template -StringVector get_all_comments(const DescriptorType* descriptor) { - StringVector comments; - grpc_generator::GetComment( - descriptor, grpc_generator::COMMENTTYPE_LEADING_DETACHED, &comments); - grpc_generator::GetComment(descriptor, grpc_generator::COMMENTTYPE_LEADING, - &comments); - grpc_generator::GetComment(descriptor, grpc_generator::COMMENTTYPE_TRAILING, - &comments); - return comments; -} - -inline void Split(const std::string& s, char delim, - std::vector* append_to) { - if (s.empty()) { - // splitting an empty string logically produces a single-element list - append_to->emplace_back(); - } else { - auto current = s.begin(); - while (current < s.end()) { - const auto next = std::find(current, s.end(), delim); - append_to->emplace_back(current, next); - current = next; - if (current != s.end()) { - // it was the delimiter - need to be at the start of the next entry - ++current; - } - } - } -} - -} // namespace - -} // namespace grpc_python_generator - -#endif // GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_HELPERS_H diff --git a/deps/grpc/src/compiler/python_plugin.cc b/deps/grpc/src/compiler/python_plugin.cc deleted file mode 100644 index 81eb1d4fc2..0000000000 --- a/deps/grpc/src/compiler/python_plugin.cc +++ /dev/null @@ -1,29 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates a Python gRPC service interface out of Protobuf IDL. - -#include "src/compiler/config.h" -#include "src/compiler/protobuf_plugin.h" -#include "src/compiler/python_generator.h" - -int main(int argc, char* argv[]) { - grpc_python_generator::GeneratorConfiguration config; - grpc_python_generator::PythonGrpcGenerator generator(config); - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/python_private_generator.h b/deps/grpc/src/compiler/python_private_generator.h deleted file mode 100644 index 62f92509f9..0000000000 --- a/deps/grpc/src/compiler/python_private_generator.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H - -#include -#include - -#include "src/compiler/python_generator.h" -#include "src/compiler/schema_interface.h" - -namespace grpc_python_generator { - -namespace { - -// Tucks all generator state in an anonymous namespace away from -// PythonGrpcGenerator and the header file, mostly to encourage future changes -// to not require updates to the grpcio-tools C++ code part. Assumes that it is -// only ever used from a single thread. -struct PrivateGenerator { - const GeneratorConfiguration& config; - const grpc_generator::File* file; - - bool generate_in_pb2_grpc; - - PrivateGenerator(const GeneratorConfiguration& config, - const grpc_generator::File* file); - - std::pair GetGrpcServices(); - - private: - bool PrintPreamble(grpc_generator::Printer* out); - bool PrintBetaPreamble(grpc_generator::Printer* out); - bool PrintGAServices(grpc_generator::Printer* out); - bool PrintBetaServices(grpc_generator::Printer* out); - - bool PrintAddServicerToServer( - const std::string& package_qualified_service_name, - const grpc_generator::Service* service, grpc_generator::Printer* out); - bool PrintServicer(const grpc_generator::Service* service, - grpc_generator::Printer* out); - bool PrintStub(const std::string& package_qualified_service_name, - const grpc_generator::Service* service, - grpc_generator::Printer* out); - - bool PrintServiceClass(const std::string& package_qualified_service_name, - const grpc_generator::Service* service, - grpc_generator::Printer* out); - bool PrintBetaServicer(const grpc_generator::Service* service, - grpc_generator::Printer* out); - bool PrintBetaServerFactory(const std::string& package_qualified_service_name, - const grpc_generator::Service* service, - grpc_generator::Printer* out); - bool PrintBetaStub(const grpc_generator::Service* service, - grpc_generator::Printer* out); - bool PrintBetaStubFactory(const std::string& package_qualified_service_name, - const grpc_generator::Service* service, - grpc_generator::Printer* out); - - // Get all comments (leading, leading_detached, trailing) and print them as a - // docstring. Any leading space of a line will be removed, but the line - // wrapping will not be changed. - void PrintAllComments(std::vector comments, - grpc_generator::Printer* out); -}; - -} // namespace - -} // namespace grpc_python_generator - -#endif // GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H diff --git a/deps/grpc/src/compiler/ruby_generator.cc b/deps/grpc/src/compiler/ruby_generator.cc deleted file mode 100644 index b1edc7c618..0000000000 --- a/deps/grpc/src/compiler/ruby_generator.cc +++ /dev/null @@ -1,244 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/compiler/ruby_generator.h" - -#include -#include -#include - -#include "src/compiler/config.h" -#include "src/compiler/ruby_generator_helpers-inl.h" -#include "src/compiler/ruby_generator_map-inl.h" -#include "src/compiler/ruby_generator_string-inl.h" - -using grpc::protobuf::FileDescriptor; -using grpc::protobuf::MethodDescriptor; -using grpc::protobuf::ServiceDescriptor; -using grpc::protobuf::io::Printer; -using grpc::protobuf::io::StringOutputStream; -using std::map; -using std::vector; - -namespace grpc_ruby_generator { -namespace { - -// Prints out the method using the ruby gRPC DSL. -void PrintMethod(const MethodDescriptor* method, Printer* out) { - std::string input_type = RubyTypeOf(method->input_type()); - if (method->client_streaming()) { - input_type = "stream(" + input_type + ")"; - } - std::string output_type = RubyTypeOf(method->output_type()); - if (method->server_streaming()) { - output_type = "stream(" + output_type + ")"; - } - std::map method_vars = ListToDict({ - "mth.name", - method->name(), - "input.type", - input_type, - "output.type", - output_type, - }); - out->Print(GetRubyComments(method, true).c_str()); - out->Print(method_vars, "rpc :$mth.name$, $input.type$, $output.type$\n"); - out->Print(GetRubyComments(method, false).c_str()); -} - -// Prints out the service using the ruby gRPC DSL. -void PrintService(const ServiceDescriptor* service, Printer* out) { - if (service->method_count() == 0) { - return; - } - - // Begin the service module - std::map module_vars = ListToDict({ - "module.name", - Modularize(service->name()), - }); - out->Print(module_vars, "module $module.name$\n"); - out->Indent(); - - out->Print(GetRubyComments(service, true).c_str()); - out->Print("class Service\n"); - - // Write the indented class body. - out->Indent(); - out->Print("\n"); - out->Print("include ::GRPC::GenericService\n"); - out->Print("\n"); - out->Print("self.marshal_class_method = :encode\n"); - out->Print("self.unmarshal_class_method = :decode\n"); - std::map pkg_vars = - ListToDict({"service_full_name", service->full_name()}); - out->Print(pkg_vars, "self.service_name = '$service_full_name$'\n"); - out->Print("\n"); - for (int i = 0; i < service->method_count(); ++i) { - PrintMethod(service->method(i), out); - } - out->Outdent(); - - out->Print("end\n"); - out->Print("\n"); - out->Print("Stub = Service.rpc_stub_class\n"); - - // End the service module - out->Outdent(); - out->Print("end\n"); - out->Print(GetRubyComments(service, false).c_str()); -} - -} // namespace - -// The following functions are copied directly from the source for the protoc -// ruby generator -// to ensure compatibility (with the exception of int and string type changes). -// See -// https://github.com/protocolbuffers/protobuf/blob/63895855d7b1298bee97591cbafced49f23902da/src/google/protobuf/compiler/ruby/ruby_generator.cc#L312 -// TODO: keep up to date with protoc code generation, though this behavior isn't -// expected to change - -// Locale-agnostic utility functions. -bool IsLower(char ch) { return ch >= 'a' && ch <= 'z'; } - -bool IsUpper(char ch) { return ch >= 'A' && ch <= 'Z'; } - -bool IsAlpha(char ch) { return IsLower(ch) || IsUpper(ch); } - -char UpperChar(char ch) { return IsLower(ch) ? (ch - 'a' + 'A') : ch; } - -// Package names in protobuf are snake_case by convention, but Ruby module -// names must be PascalCased. -// -// foo_bar_baz -> FooBarBaz -std::string PackageToModule(const std::string& name) { - bool next_upper = true; - std::string result; - result.reserve(name.size()); - - for (std::string::size_type i = 0; i < name.size(); i++) { - if (name[i] == '_') { - next_upper = true; - } else { - if (next_upper) { - result.push_back(UpperChar(name[i])); - } else { - result.push_back(name[i]); - } - next_upper = false; - } - } - - return result; -} - -// Class and enum names in protobuf should be PascalCased by convention, but -// since there is nothing enforcing this we need to ensure that they are valid -// Ruby constants. That mainly means making sure that the first character is -// an upper-case letter. -std::string RubifyConstant(const std::string& name) { - std::string ret = name; - if (!ret.empty()) { - if (IsLower(ret[0])) { - // If it starts with a lowercase letter, capitalize it. - ret[0] = UpperChar(ret[0]); - } else if (!IsAlpha(ret[0])) { - // Otherwise (e.g. if it begins with an underscore), we need to come up - // with some prefix that starts with a capital letter. We could be smarter - // here, e.g. try to strip leading underscores, but this may cause other - // problems if the user really intended the name. So let's just prepend a - // well-known suffix. - ret = "PB_" + ret; - } - } - - return ret; -} -// end copying of protoc generator for ruby code - -std::string GetServices(const FileDescriptor* file) { - std::string output; - { - // Scope the output stream so it closes and finalizes output to the string. - - StringOutputStream output_stream(&output); - Printer out(&output_stream, '$'); - - // Don't write out any output if there no services, to avoid empty service - // files being generated for proto files that don't declare any. - if (file->service_count() == 0) { - return output; - } - - std::string package_name = RubyPackage(file); - - // Write out a file header. - std::map header_comment_vars = ListToDict({ - "file.name", - file->name(), - "file.package", - package_name, - }); - out.Print("# Generated by the protocol buffer compiler. DO NOT EDIT!\n"); - out.Print(header_comment_vars, - "# Source: $file.name$ for package '$file.package$'\n"); - - std::string leading_comments = GetRubyComments(file, true); - if (!leading_comments.empty()) { - out.Print("# Original file comments:\n"); - out.PrintRaw(leading_comments.c_str()); - } - - out.Print("\n"); - out.Print("require 'grpc'\n"); - // Write out require statemment to import the separately generated file - // that defines the messages used by the service. This is generated by the - // main ruby plugin. - std::map dep_vars = ListToDict({ - "dep.name", - MessagesRequireName(file), - }); - out.Print(dep_vars, "require '$dep.name$'\n"); - - // Write out services within the modules - out.Print("\n"); - std::vector modules = Split(package_name, '.'); - for (size_t i = 0; i < modules.size(); ++i) { - std::map module_vars = ListToDict({ - "module.name", - PackageToModule(modules[i]), - }); - out.Print(module_vars, "module $module.name$\n"); - out.Indent(); - } - for (int i = 0; i < file->service_count(); ++i) { - auto service = file->service(i); - PrintService(service, &out); - } - for (size_t i = 0; i < modules.size(); ++i) { - out.Outdent(); - out.Print("end\n"); - } - - out.Print(GetRubyComments(file, false).c_str()); - } - return output; -} - -} // namespace grpc_ruby_generator diff --git a/deps/grpc/src/compiler/ruby_generator.h b/deps/grpc/src/compiler/ruby_generator.h deleted file mode 100644 index 939b2453db..0000000000 --- a/deps/grpc/src/compiler/ruby_generator.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_H -#define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_H - -#include "src/compiler/config.h" - -namespace grpc_ruby_generator { - -std::string GetServices(const grpc::protobuf::FileDescriptor* file); - -} // namespace grpc_ruby_generator - -#endif // GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_H diff --git a/deps/grpc/src/compiler/ruby_generator_helpers-inl.h b/deps/grpc/src/compiler/ruby_generator_helpers-inl.h deleted file mode 100644 index bb919439d5..0000000000 --- a/deps/grpc/src/compiler/ruby_generator_helpers-inl.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_HELPERS_INL_H -#define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_HELPERS_INL_H - -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" -#include "src/compiler/ruby_generator_string-inl.h" - -namespace grpc_ruby_generator { - -inline bool ServicesFilename(const grpc::protobuf::FileDescriptor* file, - std::string* file_name_or_error) { - // Get output file name. - static const unsigned proto_suffix_length = 6; // length of ".proto" - if (file->name().size() > proto_suffix_length && - file->name().find_last_of(".proto") == file->name().size() - 1) { - *file_name_or_error = - file->name().substr(0, file->name().size() - proto_suffix_length) + - "_services_pb.rb"; - return true; - } else { - *file_name_or_error = "Invalid proto file name: must end with .proto"; - return false; - } -} - -inline std::string MessagesRequireName( - const grpc::protobuf::FileDescriptor* file) { - return Replace(file->name(), ".proto", "_pb"); -} - -// Get leading or trailing comments in a string. Comment lines start with "# ". -// Leading detached comments are put in front of leading comments. -template -inline std::string GetRubyComments(const DescriptorType* desc, bool leading) { - return grpc_generator::GetPrefixedComments(desc, leading, "#"); -} - -} // namespace grpc_ruby_generator - -#endif // GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_HELPERS_INL_H diff --git a/deps/grpc/src/compiler/ruby_generator_map-inl.h b/deps/grpc/src/compiler/ruby_generator_map-inl.h deleted file mode 100644 index 8951552352..0000000000 --- a/deps/grpc/src/compiler/ruby_generator_map-inl.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_MAP_INL_H -#define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_MAP_INL_H - -#include -#include -#include -#include // NOLINT -#include - -#include "src/compiler/config.h" - -using std::initializer_list; -using std::map; -using std::vector; - -namespace grpc_ruby_generator { - -// Converts an initializer list of the form { key0, value0, key1, value1, ... } -// into a map of key* to value*. Is merely a readability helper for later code. -inline std::map ListToDict( - const initializer_list& values) { - if (values.size() % 2 != 0) { - std::cerr << "Not every 'key' has a value in `values`." << std::endl; - } - std::map value_map; - auto value_iter = values.begin(); - for (unsigned i = 0; i < values.size() / 2; ++i) { - std::string key = *value_iter; - ++value_iter; - std::string value = *value_iter; - value_map[key] = value; - ++value_iter; - } - return value_map; -} - -} // namespace grpc_ruby_generator - -#endif // GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_MAP_INL_H diff --git a/deps/grpc/src/compiler/ruby_generator_string-inl.h b/deps/grpc/src/compiler/ruby_generator_string-inl.h deleted file mode 100644 index 20cf0902cc..0000000000 --- a/deps/grpc/src/compiler/ruby_generator_string-inl.h +++ /dev/null @@ -1,151 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_STRING_INL_H -#define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_STRING_INL_H - -#include -#include -#include - -#include "src/compiler/config.h" - -using std::getline; -using std::transform; - -namespace grpc_ruby_generator { - -std::string RubifyConstant(const std::string& name); - -// Split splits a string using char into elems. -inline std::vector& Split(const std::string& s, char delim, - std::vector* elems) { - std::stringstream ss(s); - std::string item; - while (getline(ss, item, delim)) { - elems->push_back(item); - } - return *elems; -} - -// Split splits a string using char, returning the result in a vector. -inline std::vector Split(const std::string& s, char delim) { - std::vector elems; - Split(s, delim, &elems); - return elems; -} - -// Replace replaces from with to in s. -inline std::string Replace(std::string s, const std::string& from, - const std::string& to) { - size_t start_pos = s.find(from); - if (start_pos == std::string::npos) { - return s; - } - s.replace(start_pos, from.length(), to); - return s; -} - -// ReplaceAll replaces all instances of search with replace in s. -inline std::string ReplaceAll(std::string s, const std::string& search, - const std::string& replace) { - size_t pos = 0; - while ((pos = s.find(search, pos)) != std::string::npos) { - s.replace(pos, search.length(), replace); - pos += replace.length(); - } - return s; -} - -// ReplacePrefix replaces from with to in s if search is a prefix of s. -inline bool ReplacePrefix(std::string* s, const std::string& from, - const std::string& to) { - size_t start_pos = s->find(from); - if (start_pos == std::string::npos || start_pos != 0) { - return false; - } - s->replace(start_pos, from.length(), to); - return true; -} - -// Modularize converts a string into a ruby module compatible name -inline std::string Modularize(std::string s) { - if (s.empty()) { - return s; - } - std::string new_string = ""; - bool was_last_underscore = false; - new_string.append(1, ::toupper(s[0])); - for (std::string::size_type i = 1; i < s.size(); ++i) { - if (was_last_underscore && s[i] != '_') { - new_string.append(1, ::toupper(s[i])); - } else if (s[i] != '_') { - new_string.append(1, s[i]); - } - was_last_underscore = s[i] == '_'; - } - return new_string; -} - -// RubyPackage gets the ruby package in either proto or ruby_package format -inline std::string RubyPackage(const grpc::protobuf::FileDescriptor* file) { - std::string package_name = file->package(); - if (file->options().has_ruby_package()) { - package_name = file->options().ruby_package(); - - // If :: is in the package convert the Ruby formatted name - // -> A::B::C - // to use the dot seperator notation - // -> A.B.C - package_name = ReplaceAll(package_name, "::", "."); - } - return package_name; -} - -// RubyTypeOf updates a proto type to the required ruby equivalent. -inline std::string RubyTypeOf(const grpc::protobuf::Descriptor* descriptor) { - std::string proto_type = descriptor->full_name(); - if (descriptor->file()->options().has_ruby_package()) { - // remove the leading package if present - ReplacePrefix(&proto_type, descriptor->file()->package(), ""); - ReplacePrefix(&proto_type, ".", ""); // remove the leading . (no package) - proto_type = RubyPackage(descriptor->file()) + "." + proto_type; - } - std::string res("." + proto_type); - if (res.find('.') == std::string::npos) { - return res; - } else { - std::vector prefixes_and_type = Split(res, '.'); - res.clear(); - for (unsigned int i = 0; i < prefixes_and_type.size(); ++i) { - if (i != 0) { - res += "::"; // switch '.' to the ruby module delim - } - if (i < prefixes_and_type.size() - 1) { - res += Modularize(prefixes_and_type[i]); // capitalize pkgs - } else { - res += RubifyConstant(prefixes_and_type[i]); - } - } - return res; - } -} - -} // namespace grpc_ruby_generator - -#endif // GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_STRING_INL_H diff --git a/deps/grpc/src/compiler/ruby_plugin.cc b/deps/grpc/src/compiler/ruby_plugin.cc deleted file mode 100644 index c70206c6b3..0000000000 --- a/deps/grpc/src/compiler/ruby_plugin.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// Generates Ruby gRPC service interface out of Protobuf IDL. - -#include - -#include "src/compiler/config.h" -#include "src/compiler/ruby_generator.h" -#include "src/compiler/ruby_generator_helpers-inl.h" - -class RubyGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { - public: - RubyGrpcGenerator() {} - ~RubyGrpcGenerator() {} - - uint64_t GetSupportedFeatures() const override { - return FEATURE_PROTO3_OPTIONAL -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - | FEATURE_SUPPORTS_EDITIONS -#endif - ; - } - -#ifdef GRPC_PROTOBUF_EDITION_SUPPORT - grpc::protobuf::Edition GetMinimumEdition() const override { - return grpc::protobuf::Edition::EDITION_PROTO2; - } - grpc::protobuf::Edition GetMaximumEdition() const override { - return grpc::protobuf::Edition::EDITION_2023; - } -#endif - - bool Generate(const grpc::protobuf::FileDescriptor* file, - const std::string& /*parameter*/, - grpc::protobuf::compiler::GeneratorContext* context, - std::string* /*error*/) const override { - std::string code = grpc_ruby_generator::GetServices(file); - if (code.size() == 0) { - return true; // don't generate a file if there are no services - } - - // Get output file name. - std::string file_name; - if (!grpc_ruby_generator::ServicesFilename(file, &file_name)) { - return false; - } - std::unique_ptr output( - context->Open(file_name)); - grpc::protobuf::io::CodedOutputStream coded_out(output.get()); - coded_out.WriteRaw(code.data(), code.size()); - return true; - } -}; - -int main(int argc, char* argv[]) { - RubyGrpcGenerator generator; - return grpc::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/deps/grpc/src/compiler/schema_interface.h b/deps/grpc/src/compiler/schema_interface.h deleted file mode 100644 index 2e2bdd32d8..0000000000 --- a/deps/grpc/src/compiler/schema_interface.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H -#define GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H - -#include -#include -#include - -#include "src/compiler/config.h" - -#ifdef GRPC_CUSTOM_STRING -#warning GRPC_CUSTOM_STRING is no longer supported. Please use std::string. -#endif - -namespace grpc { - -// Using grpc::string and grpc::to_string is discouraged in favor of -// std::string and std::to_string. This is only for legacy code using -// them explictly. -using std::string; // deprecated -using std::to_string; // deprecated - -} // namespace grpc - -namespace grpc_generator { - -// A common interface for objects having comments in the source. -// Return formatted comments to be inserted in generated code. -struct CommentHolder { - virtual ~CommentHolder() {} - virtual std::string GetLeadingComments(const std::string prefix) const = 0; - virtual std::string GetTrailingComments(const std::string prefix) const = 0; - virtual std::vector GetAllComments() const = 0; -}; - -// An abstract interface representing a method. -struct Method : public CommentHolder { - virtual ~Method() {} - - virtual std::string name() const = 0; - - virtual std::string input_type_name() const = 0; - virtual std::string output_type_name() const = 0; - - virtual bool get_module_and_message_path_input( - std::string* str, std::string generator_file_name, - bool generate_in_pb2_grpc, std::string import_prefix, - const std::vector& prefixes_to_filter) const = 0; - virtual bool get_module_and_message_path_output( - std::string* str, std::string generator_file_name, - bool generate_in_pb2_grpc, std::string import_prefix, - const std::vector& prefixes_to_filter) const = 0; - - virtual std::string get_input_type_name() const = 0; - virtual std::string get_output_type_name() const = 0; - virtual bool NoStreaming() const = 0; - virtual bool ClientStreaming() const = 0; - virtual bool ServerStreaming() const = 0; - virtual bool BidiStreaming() const = 0; -}; - -// An abstract interface representing a service. -struct Service : public CommentHolder { - virtual ~Service() {} - - virtual std::string name() const = 0; - - virtual int method_count() const = 0; - virtual std::unique_ptr method(int i) const = 0; -}; - -struct Printer { - virtual ~Printer() {} - - virtual void Print(const std::map& vars, - const char* template_string) = 0; - virtual void Print(const char* string) = 0; - virtual void PrintRaw(const char* string) = 0; - virtual void Indent() = 0; - virtual void Outdent() = 0; -}; - -// An interface that allows the source generated to be output using various -// libraries/idls/serializers. -struct File : public CommentHolder { - virtual ~File() {} - - virtual std::string filename() const = 0; - virtual std::string filename_without_ext() const = 0; - virtual std::string package() const = 0; - virtual std::vector package_parts() const = 0; - virtual std::string additional_headers() const = 0; - virtual std::vector GetImportNames() const { return {}; } - - virtual int service_count() const = 0; - virtual std::unique_ptr service(int i) const = 0; - - virtual std::unique_ptr CreatePrinter(std::string* str) const = 0; -}; -} // namespace grpc_generator - -#endif // GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H diff --git a/deps/grpc/src/core/BUILD b/deps/grpc/src/core/BUILD index 2f0b368bbd..dee69ed3bd 100644 --- a/deps/grpc/src/core/BUILD +++ b/deps/grpc/src/core/BUILD @@ -60,6 +60,7 @@ grpc_cc_library( "absl/functional:any_invocable", "absl/log:check", "absl/strings", + "absl/strings:str_format", ], language = "c++", deps = [ @@ -87,6 +88,9 @@ grpc_cc_library( "absl/functional:any_invocable", "absl/strings", ], + visibility = [ + "@grpc:event_engine_base_hdrs", + ], deps = [ ":memory_quota", "//:event_engine_base_hdrs", @@ -129,6 +133,42 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "latent_see", + srcs = [ + "util/latent_see.cc", + ], + hdrs = [ + "util/latent_see.h", + ], + external_deps = [ + "absl/base:core_headers", + "absl/functional:any_invocable", + "absl/log", + "absl/strings", + "absl/types:optional", + ], + deps = [ + "per_cpu", + "ring_buffer", + "//:gpr", + ], +) + +grpc_cc_library( + name = "ring_buffer", + srcs = [], + hdrs = [ + "util/ring_buffer.h", + ], + external_deps = [ + "absl/types:optional", + ], + deps = [ + "//:gpr_platform", + ], +) + grpc_cc_library( name = "transport_fwd", hdrs = [ @@ -241,6 +281,8 @@ grpc_cc_library( name = "useful", hdrs = ["util/useful.h"], external_deps = [ + "absl/log:check", + "absl/numeric:bits", "absl/strings", "absl/types:variant", ], @@ -249,6 +291,17 @@ grpc_cc_library( deps = ["//:gpr_platform"], ) +grpc_cc_library( + name = "unique_ptr_with_bitset", + hdrs = ["util/unique_ptr_with_bitset.h"], + external_deps = [ + "absl/log:check", + "absl/numeric:bits", + ], + language = "c++", + deps = ["//:gpr_platform"], +) + grpc_cc_library( name = "examine_stack", srcs = [ @@ -500,7 +553,11 @@ grpc_cc_library( grpc_cc_library( name = "poll", - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/strings:str_format", + "absl/types:optional", + ], language = "c++", public_hdrs = [ "lib/promise/poll.h", @@ -518,6 +575,7 @@ grpc_cc_library( "absl/log:check", "absl/status", "absl/status:statusor", + "absl/strings", "absl/types:optional", ], language = "c++", @@ -574,9 +632,12 @@ grpc_cc_library( "arena", "construct_destruct", "context", + "event_engine_context", + "latent_see", "poll", "promise_factory", "ref_counted", + "useful", "//:event_engine_base_hdrs", "//:exec_ctx", "//:gpr", @@ -893,6 +954,7 @@ grpc_cc_library( grpc_cc_library( name = "seq", + external_deps = ["absl/log:log"], language = "c++", public_hdrs = [ "lib/promise/seq.h", @@ -952,12 +1014,14 @@ grpc_cc_library( "atomic_utils", "construct_destruct", "context", - "event_engine_context", + "dump_args", + "latent_see", "no_destruct", "poll", "promise_factory", "promise_status", "//:gpr", + "//:grpc_trace", "//:orphanable", ], ) @@ -1293,6 +1357,7 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/functional:any_invocable", "absl/log:check", "absl/status", "absl/status:statusor", @@ -1335,6 +1400,7 @@ grpc_cc_library( "handshaker/endpoint_info/endpoint_info_handshaker.h", ], external_deps = [ + "absl/functional:any_invocable", "absl/status", ], language = "c++", @@ -1873,6 +1939,7 @@ grpc_cc_library( ], hdrs = ["lib/event_engine/thread_pool/thread_count.h"], external_deps = [ + "absl/log:log", "absl/base:core_headers", "absl/time", "absl/status", @@ -1899,8 +1966,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:flat_hash_set", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/time", "absl/types:optional", ], @@ -1910,7 +1977,6 @@ grpc_cc_library( "event_engine_basic_work_queue", "event_engine_thread_count", "event_engine_thread_local", - "event_engine_trace", "event_engine_work_queue", "examine_stack", "forkable", @@ -2244,8 +2310,8 @@ grpc_cc_library( "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/hash", - "absl/log:check", "absl/log:log", + "absl/log:check", "absl/status", "absl/status:statusor", "absl/strings", @@ -2255,7 +2321,6 @@ grpc_cc_library( "event_engine_common", "event_engine_extensions", "event_engine_tcp_socket_utils", - "event_engine_trace", "experiments", "iomgr_port", "load_file", @@ -2277,6 +2342,7 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_public_hdrs", + "//:grpc_trace", "//:ref_counted_ptr", ], ) @@ -2367,8 +2433,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2376,7 +2442,6 @@ grpc_cc_library( ], deps = [ "event_engine_tcp_socket_utils", - "event_engine_trace", "iomgr_port", "posix_event_engine_base_hdrs", "posix_event_engine_closure", @@ -2391,6 +2456,7 @@ grpc_cc_library( "//:event_engine_base_hdrs", "//:exec_ctx", "//:gpr", + "//:grpc_trace", ], ) @@ -2416,7 +2482,6 @@ grpc_cc_library( "event_engine_poller", "event_engine_tcp_socket_utils", "event_engine_thread_pool", - "event_engine_trace", "event_engine_utils", "forkable", "init_internally", @@ -2434,7 +2499,6 @@ grpc_cc_library( "posix_event_engine_timer_manager", "ref_counted_dns_resolver_interface", "useful", - "//:config_vars", "//:event_engine_base_hdrs", "//:gpr", "//:grpc_trace", @@ -2462,7 +2526,6 @@ grpc_cc_library( "event_engine_common", "event_engine_tcp_socket_utils", "event_engine_thread_pool", - "event_engine_trace", "event_engine_utils", "init_internally", "iomgr_port", @@ -2514,7 +2577,6 @@ grpc_cc_library( "event_engine_tcp_socket_utils", "event_engine_thread_pool", "event_engine_time_util", - "event_engine_trace", "//:debug_location", "//:event_engine_base_hdrs", "//:gpr", @@ -2542,7 +2604,6 @@ grpc_cc_library( "error", "event_engine_tcp_socket_utils", "event_engine_thread_pool", - "event_engine_trace", "status_helper", "windows_iocp", "//:debug_location", @@ -2573,7 +2634,6 @@ grpc_cc_library( "error", "event_engine_tcp_socket_utils", "event_engine_thread_pool", - "event_engine_trace", "windows_endpoint", "windows_iocp", "//:event_engine_base_hdrs", @@ -2606,7 +2666,6 @@ grpc_cc_library( "event_engine_common", "event_engine_tcp_socket_utils", "event_engine_thread_pool", - "event_engine_trace", "event_engine_utils", "init_internally", "posix_event_engine_closure", @@ -2652,22 +2711,6 @@ grpc_cc_library( ], ) -# TODO(hork): delete this target when refactoring to GRPC_TRACE_LOG(flag, level) -grpc_cc_library( - name = "event_engine_trace", - hdrs = [ - "lib/event_engine/trace.h", - ], - external_deps = [ - "absl/log:log", - ], - deps = [ - "//:gpr", - "//:gpr_platform", - "//:grpc_trace", - ], -) - grpc_cc_library( name = "event_engine_shim", srcs = [ @@ -2767,7 +2810,7 @@ grpc_cc_library( "@grpc:alt_grpc_base_legacy", ], deps = [ - "context", + "arena", "//:event_engine_base_hdrs", "//:gpr", ], @@ -2788,7 +2831,6 @@ grpc_cc_library( deps = [ "channel_args", "default_event_engine_factory", - "event_engine_trace", "no_destruct", "thready_event_engine", "//:config", @@ -2875,6 +2917,7 @@ grpc_cc_library( "resolved_address", "slice", "windows_iocp", + "//:config_vars", "//:debug_location", "//:event_engine_base_hdrs", "//:gpr", @@ -3091,6 +3134,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "interception_chain", + "unique_type_name", "//:channel_stack_builder", "//:debug_location", "//:gpr", @@ -3139,6 +3183,7 @@ grpc_cc_library( deps = [ "arena", "chunked_vector", + "down_cast", "ref_counted", "service_config_parser", "slice_refcount", @@ -3238,6 +3283,7 @@ grpc_cc_library( deps = [ "arena", "call_destination", + "down_cast", "grpc_service_config", "lb_policy", "unique_type_name", @@ -3296,9 +3342,6 @@ grpc_cc_library( grpc_cc_library( name = "config_selector", - srcs = [ - "client_channel/config_selector.cc", - ], hdrs = [ "client_channel/config_selector.h", ], @@ -3314,9 +3357,11 @@ grpc_cc_library( "channel_fwd", "client_channel_internal_header", "grpc_service_config", + "interception_chain", "metadata_batch", "ref_counted", "slice", + "unique_type_name", "useful", "//:gpr_public_hdrs", "//:grpc_public_hdrs", @@ -3472,6 +3517,7 @@ grpc_cc_library( hdrs = ["load_balancing/lb_policy.h"], external_deps = [ "absl/base:core_headers", + "absl/container:inlined_vector", "absl/status", "absl/status:statusor", "absl/strings", @@ -3541,6 +3587,22 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "lb_metadata", + srcs = ["client_channel/lb_metadata.cc"], + hdrs = ["client_channel/lb_metadata.h"], + external_deps = [ + "absl/log:log", + "absl/strings", + "absl/types:optional", + ], + deps = [ + "event_engine_common", + "lb_policy", + "metadata_batch", + ], +) + grpc_cc_library( name = "subchannel_interface", hdrs = ["load_balancing/subchannel_interface.h"], @@ -4068,7 +4130,6 @@ grpc_cc_library( "iomgr_fwd", "unique_type_name", "useful", - "//:api_trace", "//:channel_arg_names", "//:debug_location", "//:exec_ctx", @@ -4127,7 +4188,6 @@ grpc_cc_library( "unique_type_name", "useful", "//:alts_util", - "//:api_trace", "//:channel_arg_names", "//:exec_ctx", "//:gpr", @@ -4204,7 +4264,6 @@ grpc_cc_library( "status_helper", "unique_type_name", "useful", - "//:api_trace", "//:channel_arg_names", "//:debug_location", "//:exec_ctx", @@ -4247,7 +4306,6 @@ grpc_cc_library( "slice", "unique_type_name", "useful", - "//:api_trace", "//:exec_ctx", "//:gpr", "//:grpc_base", @@ -4259,6 +4317,89 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "token_fetcher_credentials", + srcs = [ + "lib/security/credentials/token_fetcher/token_fetcher_credentials.cc", + ], + hdrs = [ + "lib/security/credentials/token_fetcher/token_fetcher_credentials.h", + ], + external_deps = [ + "absl/container:flat_hash_set", + "absl/functional:any_invocable", + "absl/status:statusor", + "absl/types:variant", + ], + language = "c++", + deps = [ + "arena_promise", + "context", + "default_event_engine", + "metadata", + "poll", + "pollset_set", + "ref_counted", + "time", + "useful", + "//:backoff", + "//:gpr", + "//:grpc_security_base", + "//:grpc_trace", + "//:httpcli", + "//:iomgr", + "//:orphanable", + "//:promise", + "//:ref_counted_ptr", + ], +) + +grpc_cc_library( + name = "gcp_service_account_identity_credentials", + srcs = [ + "lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc", + ], + hdrs = [ + "lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h", + ], + external_deps = [ + "absl/functional:any_invocable", + "absl/status", + "absl/status:statusor", + "absl/strings", + ], + language = "c++", + deps = [ + "activity", + "arena_promise", + "closure", + "error", + "json", + "json_args", + "json_object_loader", + "json_reader", + "metadata", + "pollset_set", + "ref_counted", + "slice", + "status_conversion", + "status_helper", + "time", + "token_fetcher_credentials", + "unique_type_name", + "//:gpr", + "//:grpc_base", + "//:grpc_core_credentials_header", + "//:grpc_security_base", + "//:httpcli", + "//:iomgr", + "//:orphanable", + "//:promise", + "//:ref_counted_ptr", + "//:uri_parser", + ], +) + grpc_cc_library( name = "grpc_oauth2_credentials", srcs = [ @@ -4296,9 +4437,9 @@ grpc_cc_library( "slice_refcount", "status_helper", "time", + "token_fetcher_credentials", "unique_type_name", "useful", - "//:api_trace", "//:gpr", "//:grpc_base", "//:grpc_core_credentials_header", @@ -4357,6 +4498,7 @@ grpc_cc_library( "slice_refcount", "status_helper", "time", + "token_fetcher_credentials", "//:gpr", "//:grpc_base", "//:grpc_core_credentials_header", @@ -4604,8 +4746,6 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -4614,6 +4754,7 @@ grpc_cc_library( ], deps = [ "activity", + "arena", "arena_promise", "channel_args", "channel_fwd", @@ -4852,6 +4993,48 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "gcp_authentication_filter", + srcs = [ + "ext/filters/gcp_authentication/gcp_authentication_filter.cc", + "ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc", + ], + hdrs = [ + "ext/filters/gcp_authentication/gcp_authentication_filter.h", + "ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h", + ], + external_deps = [ + "absl/log:check", + "absl/status", + "absl/status:statusor", + "absl/strings", + "absl/types:optional", + ], + language = "c++", + deps = [ + "arena", + "channel_args", + "channel_fwd", + "context", + "gcp_service_account_identity_credentials", + "grpc_resolver_xds_attributes", + "grpc_service_config", + "json", + "json_args", + "json_object_loader", + "lru_cache", + "service_config_parser", + "validation_errors", + "xds_config", + "//:config", + "//:gpr", + "//:grpc_base", + "//:grpc_security_base", + "//:grpc_trace", + "//:ref_counted_ptr", + ], +) + grpc_cc_library( name = "grpc_lb_policy_grpclb", srcs = [ @@ -4871,6 +5054,7 @@ grpc_cc_library( "absl/container:inlined_vector", "absl/functional:function_ref", "absl/log:check", + "absl/log:globals", "absl/log:log", "absl/status", "absl/status:statusor", @@ -5024,6 +5208,7 @@ grpc_cc_library( "slice_refcount", "status_helper", "time", + "upb_utils", "uuid_v4", "validation_errors", "//:backoff", @@ -5051,17 +5236,33 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "lru_cache", + hdrs = [ + "util/lru_cache.h", + ], + external_deps = [ + "absl/container:flat_hash_map", + "absl/functional:any_invocable", + "absl/log:check", + "absl/types:optional", + ], + language = "c++", + # TODO(roth): Remove this unnecessary dependency once + # yaqs/eng/q/6510477728410501120 is resolved. + deps = ["//:grpc_public_hdrs"], +) + grpc_cc_library( name = "upb_utils", hdrs = [ - "xds/grpc/upb_utils.h", + "util/upb_utils.h", ], external_deps = [ "absl/strings", "@com_google_protobuf//upb:base", ], language = "c++", - deps = ["//:gpr_platform"], ) grpc_cc_library( @@ -5073,50 +5274,402 @@ grpc_cc_library( ) grpc_cc_library( - name = "grpc_xds_client", + name = "xds_certificate_provider", srcs = [ - "lib/security/credentials/xds/xds_credentials.cc", - "xds/grpc/certificate_provider_store.cc", - "xds/grpc/file_watcher_certificate_provider_factory.cc", - "xds/grpc/xds_audit_logger_registry.cc", - "xds/grpc/xds_bootstrap_grpc.cc", "xds/grpc/xds_certificate_provider.cc", - "xds/grpc/xds_client_grpc.cc", - "xds/grpc/xds_cluster.cc", - "xds/grpc/xds_cluster_specifier_plugin.cc", - "xds/grpc/xds_common_types.cc", - "xds/grpc/xds_endpoint.cc", - "xds/grpc/xds_health_status.cc", - "xds/grpc/xds_http_fault_filter.cc", - "xds/grpc/xds_http_filters.cc", - "xds/grpc/xds_http_rbac_filter.cc", - "xds/grpc/xds_http_stateful_session_filter.cc", - "xds/grpc/xds_lb_policy_registry.cc", - "xds/grpc/xds_listener.cc", - "xds/grpc/xds_route_config.cc", - "xds/grpc/xds_routing.cc", - "xds/grpc/xds_transport_grpc.cc", ], hdrs = [ - "lib/security/credentials/xds/xds_credentials.h", - "xds/grpc/certificate_provider_store.h", - "xds/grpc/file_watcher_certificate_provider_factory.h", - "xds/grpc/xds_audit_logger_registry.h", - "xds/grpc/xds_bootstrap_grpc.h", "xds/grpc/xds_certificate_provider.h", - "xds/grpc/xds_client_grpc.h", - "xds/grpc/xds_cluster.h", - "xds/grpc/xds_cluster_specifier_plugin.h", - "xds/grpc/xds_common_types.h", - "xds/grpc/xds_endpoint.h", + ], + external_deps = [ + "absl/base:core_headers", + "absl/functional:bind_front", + "absl/log:check", + "absl/log:log", + "absl/strings", + "absl/types:optional", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "channel_args", + "error", + "grpc_matchers", + "grpc_tls_credentials", + "unique_type_name", + "useful", + "//:gpr", + "//:grpc_base", + "//:ref_counted_ptr", + "//:tsi_ssl_credentials", + ], +) + +grpc_cc_library( + name = "xds_certificate_provider_store", + srcs = [ + "xds/grpc/certificate_provider_store.cc", + ], + hdrs = [ + "xds/grpc/certificate_provider_store.h", + ], + external_deps = [ + "absl/base:core_headers", + "absl/log:log", + "absl/strings", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "certificate_provider_factory", + "certificate_provider_registry", + "grpc_tls_credentials", + "json", + "json_args", + "json_object_loader", + "unique_type_name", + "useful", + "validation_errors", + "//:config", + "//:gpr", + "//:grpc_base", + "//:orphanable", + "//:ref_counted_ptr", + ], +) + +grpc_cc_library( + name = "xds_credentials", + srcs = [ + "lib/security/credentials/xds/xds_credentials.cc", + ], + hdrs = [ + "lib/security/credentials/xds/xds_credentials.h", + ], + external_deps = [ + "absl/status", + "absl/log:check", + "absl/log:log", + "absl/types:optional", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "channel_args", + "grpc_lb_xds_channel_args", + "grpc_matchers", + "grpc_tls_credentials", + "unique_type_name", + "useful", + "xds_certificate_provider", + "//:channel_arg_names", + "//:gpr", + "//:grpc_base", + "//:grpc_core_credentials_header", + "//:grpc_credentials_util", + "//:grpc_security_base", + "//:ref_counted_ptr", + ], +) + +grpc_cc_library( + name = "xds_file_watcher_certificate_provider_factory", + srcs = [ + "xds/grpc/file_watcher_certificate_provider_factory.cc", + ], + hdrs = [ + "xds/grpc/file_watcher_certificate_provider_factory.h", + ], + external_deps = [ + "absl/log:log", + "absl/strings", + "absl/strings:str_format", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "certificate_provider_factory", + "grpc_tls_credentials", + "json", + "json_args", + "json_object_loader", + "time", + "validation_errors", + "//:config", + "//:gpr", + "//:grpc_base", + "//:ref_counted_ptr", + ], +) + +grpc_cc_library( + name = "xds_common_types", + srcs = [ + "xds/grpc/xds_common_types.cc", + ], + hdrs = [ + "xds/grpc/xds_common_types.h", + ], + external_deps = [ + "absl/strings", + "absl/strings:str_format", + "absl/types:variant", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "grpc_matchers", + "json", + "match", + "validation_errors", + ], +) + +grpc_cc_library( + name = "xds_http_filter", + hdrs = [ + "xds/grpc/xds_http_filter.h", + ], + external_deps = [ + "absl/status:statusor", + "absl/strings", + "absl/types:optional", + "@com_google_protobuf//upb:reflection", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "channel_args", + "channel_fwd", + "interception_chain", + "json", + "json_writer", + "validation_errors", + "xds_common_types", + "//:xds_client", + ], +) + +grpc_cc_library( + name = "xds_route_config", + srcs = [ + "xds/grpc/xds_route_config.cc", + ], + hdrs = [ + "xds/grpc/xds_route_config.h", + ], + external_deps = [ + "absl/strings", + "absl/strings:str_format", + "absl/types:optional", + "absl/types:variant", + "re2", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "grpc_matchers", + "match", + "time", + "xds_http_filter", + "//:grpc_base", + "//:xds_client", + ], +) + +grpc_cc_library( + name = "xds_listener", + srcs = [ + "xds/grpc/xds_listener.cc", + ], + hdrs = [ + "xds/grpc/xds_listener.h", + ], + external_deps = [ + "absl/strings", + "absl/strings:str_format", + "absl/types:optional", + "absl/types:variant", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "match", + "resolved_address", + "time", + "xds_common_types", + "xds_http_filter", + "xds_route_config", + "//:sockaddr_utils", + "//:xds_client", + ], +) + +grpc_cc_library( + name = "xds_health_status", + srcs = [ + "xds/grpc/xds_health_status.cc", + ], + hdrs = [ "xds/grpc/xds_health_status.h", + ], + external_deps = [ + "absl/strings", + "absl/types:optional", + "absl/types:span", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "envoy_config_core_upb", + "//:endpoint_addresses", + ], +) + +grpc_cc_library( + name = "xds_server_grpc", + srcs = [ + "xds/grpc/xds_server_grpc.cc", + ], + hdrs = [ + "xds/grpc/xds_server_grpc.h", + ], + external_deps = [ + "absl/strings", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "channel_creds_registry", + "json", + "json_args", + "json_object_loader", + "json_reader", + "json_writer", + "validation_errors", + "//:config", + "//:ref_counted_ptr", + "//:xds_client", + ], +) + +grpc_cc_library( + name = "xds_metadata", + srcs = [ + "xds/grpc/xds_metadata.cc", + ], + hdrs = [ + "xds/grpc/xds_metadata.h", + ], + external_deps = [ + "absl/log:check", + "absl/container:flat_hash_map", + "absl/strings", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "down_cast", + "json", + "json_writer", + "validation_errors", + ], +) + +grpc_cc_library( + name = "xds_cluster", + srcs = [ + "xds/grpc/xds_cluster.cc", + ], + hdrs = [ + "xds/grpc/xds_cluster.h", + ], + external_deps = [ + "absl/container:flat_hash_map", + "absl/strings", + "absl/types:optional", + "absl/types:variant", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "grpc_outlier_detection_header", + "json", + "json_writer", + "match", + "time", + "xds_common_types", + "xds_health_status", + "xds_metadata", + "xds_server_grpc", + "//:xds_client", + ], +) + +grpc_cc_library( + name = "xds_endpoint", + srcs = [ + "xds/grpc/xds_endpoint.cc", + ], + hdrs = [ + "xds/grpc/xds_endpoint.h", + ], + external_deps = [ + "absl/base:core_headers", + "absl/random", + "absl/strings", + ], + language = "c++", + tags = ["nofixdeps"], + deps = [ + "ref_counted", + "//:endpoint_addresses", + "//:gpr", + "//:ref_counted_ptr", + "//:xds_client", + ], +) + +# TODO(roth): Split this up into individual targets. +grpc_cc_library( + name = "grpc_xds_client", + srcs = [ + "xds/grpc/xds_audit_logger_registry.cc", + "xds/grpc/xds_bootstrap_grpc.cc", + "xds/grpc/xds_client_grpc.cc", + "xds/grpc/xds_cluster_parser.cc", + "xds/grpc/xds_cluster_specifier_plugin.cc", + "xds/grpc/xds_common_types_parser.cc", + "xds/grpc/xds_endpoint_parser.cc", + "xds/grpc/xds_http_fault_filter.cc", + "xds/grpc/xds_http_filter_registry.cc", + "xds/grpc/xds_http_gcp_authn_filter.cc", + "xds/grpc/xds_http_rbac_filter.cc", + "xds/grpc/xds_http_stateful_session_filter.cc", + "xds/grpc/xds_lb_policy_registry.cc", + "xds/grpc/xds_listener_parser.cc", + "xds/grpc/xds_metadata_parser.cc", + "xds/grpc/xds_route_config_parser.cc", + "xds/grpc/xds_routing.cc", + "xds/grpc/xds_transport_grpc.cc", + ], + hdrs = [ + "xds/grpc/xds_audit_logger_registry.h", + "xds/grpc/xds_bootstrap_grpc.h", + "xds/grpc/xds_client_grpc.h", + "xds/grpc/xds_cluster_parser.h", + "xds/grpc/xds_cluster_specifier_plugin.h", + "xds/grpc/xds_common_types_parser.h", + "xds/grpc/xds_endpoint_parser.h", "xds/grpc/xds_http_fault_filter.h", - "xds/grpc/xds_http_filters.h", + "xds/grpc/xds_http_filter_registry.h", + "xds/grpc/xds_http_gcp_authn_filter.h", "xds/grpc/xds_http_rbac_filter.h", "xds/grpc/xds_http_stateful_session_filter.h", "xds/grpc/xds_lb_policy_registry.h", - "xds/grpc/xds_listener.h", - "xds/grpc/xds_route_config.h", + "xds/grpc/xds_listener_parser.h", + "xds/grpc/xds_metadata_parser.h", + "xds/grpc/xds_route_config_parser.h", "xds/grpc/xds_routing.h", "xds/grpc/xds_transport_grpc.h", ], @@ -5150,6 +5703,7 @@ grpc_cc_library( "certificate_provider_factory", "certificate_provider_registry", "channel_args", + "channel_args_endpoint_config", "channel_creds_registry", "channel_fwd", "closure", @@ -5172,6 +5726,8 @@ grpc_cc_library( "envoy_extensions_filters_common_fault_upb", "envoy_extensions_filters_http_fault_upb", "envoy_extensions_filters_http_fault_upbdefs", + "envoy_extensions_filters_http_gcp_authn_upb", + "envoy_extensions_filters_http_gcp_authn_upbdefs", "envoy_extensions_filters_http_rbac_upb", "envoy_extensions_filters_http_rbac_upbdefs", "envoy_extensions_filters_http_router_upb", @@ -5201,6 +5757,7 @@ grpc_cc_library( "envoy_type_upb", "error", "error_utils", + "gcp_authentication_filter", "google_rpc_status_upb", "grpc_audit_logging", "grpc_fake_credentials", @@ -5215,6 +5772,7 @@ grpc_cc_library( "grpc_tls_credentials", "grpc_transport_chttp2_client_connector", "init_internally", + "interception_chain", "iomgr_fwd", "json", "json_args", @@ -5247,6 +5805,19 @@ grpc_cc_library( "upb_utils", "useful", "validation_errors", + "xds_certificate_provider", + "xds_certificate_provider_store", + "xds_cluster", + "xds_common_types", + "xds_credentials", + "xds_endpoint", + "xds_file_watcher_certificate_provider_factory", + "xds_health_status", + "xds_http_filter", + "xds_listener", + "xds_metadata", + "xds_route_config", + "xds_server_grpc", "xds_type_upb", "xds_type_upbdefs", "//:channel", @@ -5335,7 +5906,13 @@ grpc_cc_library( "resolved_address", "slice_refcount", "unique_type_name", - "//:api_trace", + "xds_certificate_provider", + "xds_certificate_provider_store", + "xds_common_types", + "xds_credentials", + "xds_http_filter", + "xds_listener", + "xds_route_config", "//:config", "//:debug_location", "//:exec_ctx", @@ -5416,7 +5993,11 @@ grpc_cc_library( "pollset_set", "time", "unique_type_name", + "xds_cluster", + "xds_common_types", + "xds_config", "xds_dependency_manager", + "xds_health_status", "//:config", "//:debug_location", "//:gpr", @@ -5465,6 +6046,7 @@ grpc_cc_library( "delegating_helper", "grpc_backend_metric_data", "grpc_lb_xds_channel_args", + "grpc_resolver_xds_attributes", "grpc_xds_client", "json", "json_args", @@ -5479,7 +6061,9 @@ grpc_cc_library( "resolved_address", "subchannel_interface", "validation_errors", - "xds_dependency_manager", + "xds_config", + "xds_credentials", + "xds_endpoint", "//:call_tracer", "//:config", "//:debug_location", @@ -6190,7 +6774,8 @@ grpc_cc_library( "resolved_address", "subchannel_interface", "validation_errors", - "xds_dependency_manager", + "xds_config", + "xds_health_status", "//:config", "//:debug_location", "//:endpoint_addresses", @@ -6529,10 +7114,36 @@ grpc_cc_library( deps = [ "grpc_service_config", "unique_type_name", + "xds_route_config", "//:gpr_platform", ], ) +grpc_cc_library( + name = "xds_config", + srcs = [ + "resolver/xds/xds_config.cc", + ], + hdrs = [ + "resolver/xds/xds_config.h", + ], + external_deps = [ + "absl/container:flat_hash_map", + "absl/status:statusor", + "absl/strings", + "absl/types:variant", + ], + language = "c++", + deps = [ + "match", + "ref_counted", + "xds_cluster", + "xds_endpoint", + "xds_listener", + "xds_route_config", + ], +) + grpc_cc_library( name = "xds_dependency_manager", srcs = [ @@ -6554,6 +7165,11 @@ grpc_cc_library( "grpc_xds_client", "match", "ref_counted", + "xds_cluster", + "xds_config", + "xds_endpoint", + "xds_listener", + "xds_route_config", "//:config", "//:gpr", "//:grpc_resolver", @@ -6601,7 +7217,11 @@ grpc_cc_library( "ref_counted", "slice", "time", + "xds_config", "xds_dependency_manager", + "xds_http_filter", + "xds_listener", + "xds_route_config", "xxhash_inline", "//:channel_arg_names", "//:config", @@ -6802,23 +7422,6 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "max_concurrent_streams_policy", - srcs = [ - "ext/transport/chttp2/transport/max_concurrent_streams_policy.cc", - ], - hdrs = [ - "ext/transport/chttp2/transport/max_concurrent_streams_policy.h", - ], - external_deps = [ - "absl/log:check", - ], - deps = [ - "//:gpr", - "//:gpr_platform", - ], -) - grpc_cc_library( name = "huffsyms", srcs = [ @@ -6914,7 +7517,6 @@ grpc_cc_library( "tcp_connect_handshaker", "time", "unique_type_name", - "//:api_trace", "//:channel", "//:channel_arg_names", "//:channel_create", @@ -6976,7 +7578,6 @@ grpc_cc_library( "status_helper", "time", "unique_type_name", - "//:api_trace", "//:channel_arg_names", "//:channelz", "//:chttp2_legacy_frame", @@ -7009,8 +7610,8 @@ grpc_cc_library( "ext/transport/inproc/legacy_inproc_transport.h", ], external_deps = [ - "absl/log:check", "absl/log:log", + "absl/log:check", "absl/status", "absl/status:statusor", "absl/strings", @@ -7025,8 +7626,10 @@ grpc_cc_library( "closure", "connectivity_state", "error", + "event_engine_context", "experiments", "iomgr_fwd", + "metadata", "metadata_batch", "resource_quota", "slice", @@ -7034,7 +7637,6 @@ grpc_cc_library( "status_helper", "time", "try_seq", - "//:api_trace", "//:channel", "//:channel_arg_names", "//:channel_create", @@ -7375,6 +7977,7 @@ grpc_cc_library( "chaotic_good_transport", "context", "default_event_engine", + "event_engine_context", "event_engine_wakeup_scheduler", "for_each", "grpc_promise_endpoint", @@ -7433,6 +8036,24 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "call_state", + srcs = [ + "lib/transport/call_state.cc", + ], + hdrs = [ + "lib/transport/call_state.h", + ], + external_deps = ["absl/types:optional"], + deps = [ + "activity", + "poll", + "status_flag", + "//:gpr", + "//:grpc_trace", + ], +) + grpc_cc_library( name = "call_filters", srcs = [ @@ -7441,16 +8062,23 @@ grpc_cc_library( hdrs = [ "lib/transport/call_filters.h", ], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], deps = [ "call_final_info", + "call_state", "dump_args", + "if", "latch", "map", "message", "metadata", "ref_counted", + "seq", "status_flag", + "try_seq", "//:gpr", "//:promise", "//:ref_counted_ptr", @@ -7550,12 +8178,16 @@ grpc_cc_library( hdrs = [ "lib/transport/call_spine.h", ], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/functional:any_invocable", + "absl/log:check", + ], deps = [ "1999", "call_arena_allocator", "call_filters", "dual_ref_counted", + "event_engine_context", "for_each", "if", "latch", @@ -7571,6 +8203,25 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "direct_channel", + srcs = [ + "client_channel/direct_channel.cc", + ], + hdrs = [ + "client_channel/direct_channel.h", + ], + deps = [ + "channel_stack_type", + "event_engine_context", + "interception_chain", + "//:channel", + "//:config", + "//:grpc_base", + "//:orphanable", + ], +) + grpc_cc_library( name = "metadata_batch", srcs = [ @@ -7669,7 +8320,6 @@ grpc_cc_library( "ref_counted_string", "slice", "useful", - "//:api_trace", "//:gpr", "//:grpc_public_hdrs", "//:grpc_trace", @@ -7772,9 +8422,9 @@ grpc_cc_library( "chaotic_good_settings_metadata", "closure", "context", - "default_event_engine", "error", "error_utils", + "event_engine_context", "event_engine_extensions", "event_engine_query_extensions", "event_engine_tcp_socket_utils", @@ -7794,7 +8444,6 @@ grpc_cc_library( "time", "try_seq", "wait_for_callback", - "//:api_trace", "//:channel", "//:channel_create", "//:config", @@ -7923,6 +8572,16 @@ grpc_upb_proto_reflection_library( deps = ["@envoy_api//envoy/extensions/filters/http/fault/v3:pkg"], ) +grpc_upb_proto_library( + name = "envoy_extensions_filters_http_gcp_authn_upb", + deps = ["@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg"], +) + +grpc_upb_proto_reflection_library( + name = "envoy_extensions_filters_http_gcp_authn_upbdefs", + deps = ["@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg"], +) + grpc_upb_proto_library( name = "envoy_extensions_filters_http_rbac_upb", deps = ["@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg"], diff --git a/deps/grpc/src/core/channelz/channelz.cc b/deps/grpc/src/core/channelz/channelz.cc index 1baf851ed6..9487b9161e 100644 --- a/deps/grpc/src/core/channelz/channelz.cc +++ b/deps/grpc/src/core/channelz/channelz.cc @@ -29,7 +29,6 @@ #include "absl/strings/strip.h" #include -#include #include #include diff --git a/deps/grpc/src/core/channelz/channelz_registry.cc b/deps/grpc/src/core/channelz/channelz_registry.cc index 8089cc273b..63f6e557c7 100644 --- a/deps/grpc/src/core/channelz/channelz_registry.cc +++ b/deps/grpc/src/core/channelz/channelz_registry.cc @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/deps/grpc/src/core/client_channel/client_channel.cc b/deps/grpc/src/core/client_channel/client_channel.cc index 004f87bbba..f700b39463 100644 --- a/deps/grpc/src/core/client_channel/client_channel.cc +++ b/deps/grpc/src/core/client_channel/client_channel.cc @@ -28,6 +28,7 @@ #include #include "absl/cleanup/cleanup.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" @@ -43,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -61,6 +61,7 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -73,6 +74,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" +#include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" @@ -283,10 +285,10 @@ class ClientChannel::SubchannelWrapper::WatcherWrapper } } } else { - gpr_log(GPR_ERROR, - "client_channel=%p: Illegal keepalive throttling value %s", - subchannel_wrapper_->client_channel_.get(), - std::string(keepalive_throttling.value()).c_str()); + LOG(ERROR) << "client_channel=" + << subchannel_wrapper_->client_channel_.get() + << ": Illegal keepalive throttling value " + << std::string(keepalive_throttling.value()); } } // Propagate status only in state TF. @@ -453,10 +455,10 @@ class ClientChannel::ClientChannelControlHelper const char* extra = client_channel_->disconnect_error_.ok() ? "" : " (ignoring -- channel shutting down)"; - gpr_log(GPR_INFO, - "client_channel=%p: update: state=%s status=(%s) picker=%p%s", - client_channel_.get(), ConnectivityStateName(state), - status.ToString().c_str(), picker.get(), extra); + LOG(INFO) << "client_channel=" << client_channel_.get() + << ": update: state=" << ConnectivityStateName(state) + << " status=(" << status << ") picker=" << picker.get() + << extra; } // Do update only if not shutting down. if (client_channel_->disconnect_error_.ok()) { @@ -625,6 +627,7 @@ ClientChannel::ClientChannel( work_serializer_(std::make_shared(event_engine_)), state_tracker_("client_channel", GRPC_CHANNEL_IDLE), subchannel_pool_(GetSubchannelPool(channel_args_)) { + CHECK(event_engine_.get() != nullptr); GRPC_TRACE_LOG(client_channel, INFO) << "client_channel=" << this << ": creating client_channel"; // Set initial keepalive time. @@ -635,8 +638,10 @@ ClientChannel::ClientChannel( keepalive_time_ = -1; // unset } // Get stats plugins for channel. - experimental::StatsPluginChannelScope scope(this->target(), - default_authority_); + grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config( + channel_args_); + experimental::StatsPluginChannelScope scope( + this->target(), default_authority_, endpoint_config); stats_plugin_group_ = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope); } @@ -683,10 +688,93 @@ grpc_connectivity_state ClientChannel::CheckConnectivityState( return state; } -void ClientChannel::WatchConnectivityState(grpc_connectivity_state, Timestamp, - grpc_completion_queue*, void*) { - // TODO(ctiller): implement - Crash("not implemented"); +namespace { + +// A fire-and-forget object to handle external connectivity state watches. +class ExternalStateWatcher : public RefCounted { + public: + ExternalStateWatcher(WeakRefCountedPtr channel, + grpc_completion_queue* cq, void* tag, + grpc_connectivity_state last_observed_state, + Timestamp deadline) + : channel_(std::move(channel)), cq_(cq), tag_(tag) { + MutexLock lock(&mu_); + // Start watch. This inherits the ref from creation. + auto watcher = + MakeOrphanable(RefCountedPtr(this)); + watcher_ = watcher.get(); + channel_->AddConnectivityWatcher(last_observed_state, std::move(watcher)); + // Start timer. This takes a second ref. + const Duration timeout = deadline - Timestamp::Now(); + timer_handle_ = + channel_->event_engine()->RunAfter(timeout, [self = Ref()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->MaybeStartCompletion(absl::DeadlineExceededError( + "Timed out waiting for connection state change")); + // ExternalStateWatcher deletion might require an active ExecCtx. + self.reset(); + }); + } + + private: + class Watcher : public AsyncConnectivityStateWatcherInterface { + public: + explicit Watcher(RefCountedPtr external_state_watcher) + : external_state_watcher_(std::move(external_state_watcher)) {} + + void OnConnectivityStateChange(grpc_connectivity_state /*new_state*/, + const absl::Status& /*status*/) override { + external_state_watcher_->MaybeStartCompletion(absl::OkStatus()); + } + + private: + RefCountedPtr external_state_watcher_; + }; + + // This is called both when the watch reports a new connectivity state + // and when the timer fires. It will trigger a CQ notification only + // on the first call. Subsequent calls will be ignored, because + // events can come in asynchronously. + void MaybeStartCompletion(absl::Status status) { + MutexLock lock(&mu_); + if (watcher_ == nullptr) return; // Ignore subsequent notifications. + // Cancel watch. + channel_->RemoveConnectivityWatcher(watcher_); + watcher_ = nullptr; + // Cancel timer. + channel_->event_engine()->Cancel(timer_handle_); + // Send CQ completion. + Ref().release(); // Released in FinishedCompletion(). + grpc_cq_end_op(cq_, tag_, status, FinishedCompletion, this, + &completion_storage_); + } + + // Called when the completion is returned to the CQ. + static void FinishedCompletion(void* arg, grpc_cq_completion* /*ignored*/) { + auto* self = static_cast(arg); + self->Unref(); + } + + WeakRefCountedPtr channel_; + + Mutex mu_; + grpc_completion_queue* cq_ ABSL_GUARDED_BY(&mu_); + void* tag_ ABSL_GUARDED_BY(&mu_); + grpc_cq_completion completion_storage_ ABSL_GUARDED_BY(&mu_); + Watcher* watcher_ ABSL_GUARDED_BY(&mu_) = nullptr; + grpc_event_engine::experimental::EventEngine::TaskHandle timer_handle_ + ABSL_GUARDED_BY(&mu_); +}; + +} // namespace + +void ClientChannel::WatchConnectivityState(grpc_connectivity_state state, + Timestamp deadline, + grpc_completion_queue* cq, + void* tag) { + new ExternalStateWatcher(WeakRefAsSubclass(), cq, tag, state, + deadline); } void ClientChannel::AddConnectivityWatcher( @@ -768,10 +856,12 @@ grpc_call* ClientChannel::CreateCall( grpc_call* parent_call, uint32_t propagation_mask, grpc_completion_queue* cq, grpc_pollset_set* /*pollset_set_alternative*/, Slice path, absl::optional authority, Timestamp deadline, bool) { + auto arena = call_arena_allocator()->MakeArena(); + arena->SetContext( + event_engine()); return MakeClientCall(parent_call, propagation_mask, cq, std::move(path), std::move(authority), false, deadline, - compression_options(), event_engine_.get(), - call_arena_allocator()->MakeArena(), Ref()); + compression_options(), std::move(arena), Ref()); } void ClientChannel::StartCall(UnstartedCallHandler unstarted_handler) { @@ -907,15 +997,13 @@ RefCountedPtr ChooseLbPolicy( .LoadBalancingPolicyExists(*policy_name, &requires_config) || requires_config)) { if (requires_config) { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args must not " - "require a config. Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args must not " + "require a config. Using pick_first instead."; } else { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args does not exist. " - "Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args does not exist. " + "Using pick_first instead."; } policy_name = "pick_first"; } @@ -1017,6 +1105,10 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { service_config = std::move(*result.service_config); config_selector = result.args.GetObjectRef(); } + // Remove the config selector from channel args so that we're not holding + // unnecessary refs that cause it to be destroyed somewhere other than in + // the WorkSerializer. + result.args = result.args.Remove(GRPC_ARG_CONFIG_SELECTOR); // Note: The only case in which service_config is null here is if the // resolver returned a service config error and we don't have a previous // service config to fall back to. @@ -1050,6 +1142,7 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { << "client_channel=" << this << ": service config not changed"; } // Create or update LB policy, as needed. + ChannelArgs new_args = result.args; resolver_result_status = CreateOrUpdateLbPolicyLocked( std::move(lb_policy_config), parsed_service_config->health_check_service_name(), std::move(result)); @@ -1058,7 +1151,7 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { // the ConfigSelector may need the LB policy to know about new // destinations before it can send RPCs to those destinations. if (service_config_changed || config_selector_changed) { - UpdateServiceConfigInDataPlaneLocked(); + UpdateServiceConfigInDataPlaneLocked(new_args); } } // Invoke resolver callback if needed. @@ -1108,10 +1201,7 @@ absl::Status ClientChannel::CreateOrUpdateLbPolicyLocked( } update_args.config = std::move(lb_policy_config); update_args.resolution_note = std::move(result.resolution_note); - // Remove the config selector from channel args so that we're not holding - // unnecessary refs that cause it to be destroyed somewhere other than in - // the WorkSerializer. - update_args.args = result.args.Remove(GRPC_ARG_CONFIG_SELECTOR); + update_args.args = std::move(result.args); // Add health check service name to channel args. if (health_check_service_name.has_value()) { update_args.args = update_args.args.Set(GRPC_ARG_HEALTH_CHECK_SERVICE_NAME, @@ -1176,7 +1266,8 @@ void ClientChannel::UpdateServiceConfigInControlPlaneLocked( } } -void ClientChannel::UpdateServiceConfigInDataPlaneLocked() { +void ClientChannel::UpdateServiceConfigInDataPlaneLocked( + const ChannelArgs& args) { GRPC_TRACE_LOG(client_channel, INFO) << "client_channel=" << this << ": switching to ConfigSelector " << saved_config_selector_.get(); @@ -1187,7 +1278,7 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked() { MakeRefCounted(saved_service_config_); } // Construct filter stack. - InterceptionChainBuilder builder(channel_args_.SetObject(this)); + InterceptionChainBuilder builder(args.SetObject(this)); if (idle_timeout_ != Duration::Zero()) { builder.AddOnServerTrailingMetadata([this](ServerMetadata&) { if (idle_state_.DecreaseCallCount()) StartIdleTimer(); @@ -1195,14 +1286,17 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked() { } CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( GRPC_CLIENT_CHANNEL, builder); - // TODO(roth): add filters returned by config selector - // Create call destination. + // Add filters returned by the config selector (e.g., xDS HTTP filters). + config_selector->AddFilters(builder); + // TODO(roth, ctiller): When we implement the retry interceptor, that + // needs to be added *after* the filters added by the config selector. const bool enable_retries = !channel_args_.WantMinimalStack() && channel_args_.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true); if (enable_retries) { Crash("call v3 stack does not yet support retries"); } + // Create call destination. auto top_of_stack_call_destination = builder.Build(call_destination_); // Send result to data plane. if (!top_of_stack_call_destination.ok()) { @@ -1254,6 +1348,9 @@ void ClientChannel::StartIdleTimer() { } }); }); + auto arena = SimpleArenaAllocator(0)->MakeArena(); + arena->SetContext( + event_engine()); idle_activity_.Set(MakeActivity( std::move(promise), ExecCtxWakeupScheduler{}, [self = std::move(self)](absl::Status status) mutable { @@ -1265,13 +1362,14 @@ void ClientChannel::StartIdleTimer() { GRPC_CHANNEL_IDLE, absl::OkStatus(), "channel entering IDLE", nullptr); // TODO(roth): In case there's a race condition, we - // might need to check for any calls that are queued - // waiting for a resolver result or an LB pick. + // might need to check for any calls that are + // queued waiting for a resolver result or an LB + // pick. }, DEBUG_LOCATION); } }, - GetContext())); + std::move(arena))); } absl::Status ClientChannel::ApplyServiceConfigToCall( diff --git a/deps/grpc/src/core/client_channel/client_channel.h b/deps/grpc/src/core/client_channel/client_channel.h index 13809c0447..7a73a2259d 100644 --- a/deps/grpc/src/core/client_channel/client_channel.h +++ b/deps/grpc/src/core/client_channel/client_channel.h @@ -149,7 +149,7 @@ class ClientChannel : public Channel { RefCountedPtr config_selector, std::string lb_policy_name) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_); - void UpdateServiceConfigInDataPlaneLocked() + void UpdateServiceConfigInDataPlaneLocked(const ChannelArgs& args) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_); void UpdateStateLocked(grpc_connectivity_state state, diff --git a/deps/grpc/src/core/client_channel/client_channel_filter.cc b/deps/grpc/src/core/client_channel/client_channel_filter.cc index 84724d63df..70ef58f52c 100644 --- a/deps/grpc/src/core/client_channel/client_channel_filter.cc +++ b/deps/grpc/src/core/client_channel/client_channel_filter.cc @@ -31,6 +31,7 @@ #include "absl/cleanup/cleanup.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include #include @@ -57,6 +57,7 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/dynamic_filters.h" #include "src/core/client_channel/global_subchannel_pool.h" +#include "src/core/client_channel/lb_metadata.h" #include "src/core/client_channel/local_subchannel_pool.h" #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/subchannel.h" @@ -316,7 +317,7 @@ const grpc_channel_filter ClientChannelFilter::kFilter = { grpc_channel_stack_no_post_init, ClientChannelFilter::Destroy, ClientChannelFilter::GetChannelInfo, - "client-channel", + GRPC_UNIQUE_TYPE_NAME_HERE("client-channel"), }; // @@ -443,7 +444,7 @@ const grpc_channel_filter DynamicTerminationFilter::kFilterVtable = { grpc_channel_stack_no_post_init, DynamicTerminationFilter::Destroy, DynamicTerminationFilter::GetChannelInfo, - "dynamic_filter_termination", + GRPC_UNIQUE_TYPE_NAME_HERE("dynamic_filter_termination"), }; } // namespace @@ -705,9 +706,9 @@ class ClientChannelFilter::SubchannelWrapper final } } } else { - gpr_log(GPR_ERROR, "chand=%p: Illegal keepalive throttling value %s", - parent_->chand_, - std::string(keepalive_throttling.value()).c_str()); + LOG(ERROR) << "chand=" << parent_->chand_ + << ": Illegal keepalive throttling value " + << std::string(keepalive_throttling.value()); } } // Propagate status only in state TF. @@ -1210,15 +1211,13 @@ RefCountedPtr ChooseLbPolicy( .LoadBalancingPolicyExists(*policy_name, &requires_config) || requires_config)) { if (requires_config) { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args must not " - "require a config. Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args must not " + "require a config. Using pick_first instead."; } else { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args does not exist. " - "Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args does not exist. " + "Using pick_first instead."; } policy_name = "pick_first"; } @@ -1320,6 +1319,10 @@ void ClientChannelFilter::OnResolverResultChangedLocked( service_config = std::move(*result.service_config); config_selector = result.args.GetObjectRef(); } + // Remove the config selector from channel args so that we're not holding + // unnecessary refs that cause it to be destroyed somewhere other than in the + // WorkSerializer. + result.args = result.args.Remove(GRPC_ARG_CONFIG_SELECTOR); // Note: The only case in which service_config is null here is if the resolver // returned a service config error and we don't have a previous service // config to fall back to. @@ -1350,6 +1353,7 @@ void ClientChannelFilter::OnResolverResultChangedLocked( << "chand=" << this << ": service config not changed"; } // Create or update LB policy, as needed. + ChannelArgs new_args = result.args; resolver_result_status = CreateOrUpdateLbPolicyLocked( std::move(lb_policy_config), parsed_service_config->health_check_service_name(), std::move(result)); @@ -1358,7 +1362,7 @@ void ClientChannelFilter::OnResolverResultChangedLocked( // This needs to happen after the LB policy has been updated, since // the ConfigSelector may need the LB policy to know about new // destinations before it can send RPCs to those destinations. - UpdateServiceConfigInDataPlaneLocked(); + UpdateServiceConfigInDataPlaneLocked(new_args); // TODO(ncteisen): might be worth somehow including a snippet of the // config in the trace, at the risk of bloating the trace logs. trace_strings.push_back("Service config changed"); @@ -1414,10 +1418,7 @@ absl::Status ClientChannelFilter::CreateOrUpdateLbPolicyLocked( } update_args.config = std::move(lb_policy_config); update_args.resolution_note = std::move(result.resolution_note); - // Remove the config selector from channel args so that we're not holding - // unnecessary refs that cause it to be destroyed somewhere other than in the - // WorkSerializer. - update_args.args = result.args.Remove(GRPC_ARG_CONFIG_SELECTOR); + update_args.args = std::move(result.args); // Add health check service name to channel args. if (health_check_service_name.has_value()) { update_args.args = update_args.args.Set(GRPC_ARG_HEALTH_CHECK_SERVICE_NAME, @@ -1481,7 +1482,8 @@ void ClientChannelFilter::UpdateServiceConfigInControlPlaneLocked( << saved_config_selector_.get(); } -void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked() { +void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked( + const ChannelArgs& args) { // Grab ref to service config. RefCountedPtr service_config = saved_service_config_; // Grab ref to config selector. Use default if resolver didn't supply one. @@ -1493,8 +1495,7 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked() { config_selector = MakeRefCounted(saved_service_config_); } - ChannelArgs new_args = - channel_args_.SetObject(this).SetObject(service_config); + ChannelArgs new_args = args.SetObject(this).SetObject(service_config); bool enable_retries = !new_args.WantMinimalStack() && new_args.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true); @@ -2016,8 +2017,9 @@ void ClientChannelFilter::FilterBasedCallData::StartTransportStreamOpBatch( auto* chand = static_cast(elem->channel_data); if (GRPC_TRACE_FLAG_ENABLED(client_channel_call) && !GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: batch started from above: %s", chand, - calld, grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "chand=" << chand << " calld=" << calld + << ": batch started from above: " + << grpc_transport_stream_op_batch_string(batch, false); } // Intercept recv_trailing_metadata to commit the call, in case we wind up // failing the call before we get down to the retry or LB call layer. @@ -2159,9 +2161,8 @@ void ClientChannelFilter::FilterBasedCallData::PendingBatchesFail( for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s", - chand(), this, num_batches, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand() << " calld=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2202,10 +2203,9 @@ void ClientChannelFilter::FilterBasedCallData::PendingBatchesResume() { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p calld=%p: starting %" PRIuPTR - " pending batches on dynamic_call=%p", - chand(), this, num_batches, dynamic_call_.get()); + LOG(INFO) << "chand=" << chand() << " calld=" << this << ": starting " + << num_batches + << " pending batches on dynamic_call=" << dynamic_call_.get(); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2356,81 +2356,6 @@ class ClientChannelFilter::LoadBalancedCall::LbCallState final LoadBalancedCall* lb_call_; }; -// -// ClientChannelFilter::LoadBalancedCall::Metadata -// - -class ClientChannelFilter::LoadBalancedCall::Metadata final - : public LoadBalancingPolicy::MetadataInterface { - public: - explicit Metadata(grpc_metadata_batch* batch) : batch_(batch) {} - - void Add(absl::string_view key, absl::string_view value) override { - if (batch_ == nullptr) return; - // Gross, egregious hack to support legacy grpclb behavior. - // TODO(ctiller): Use a promise context for this once that plumbing is done. - if (key == GrpcLbClientStatsMetadata::key()) { - batch_->Set( - GrpcLbClientStatsMetadata(), - const_cast( - reinterpret_cast(value.data()))); - return; - } - batch_->Append(key, Slice::FromStaticString(value), - [key](absl::string_view error, const Slice& value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat(error, " key:", key, - " value:", value.as_string_view()) - .c_str()); - }); - } - - std::vector> TestOnlyCopyToVector() - override { - if (batch_ == nullptr) return {}; - Encoder encoder; - batch_->Encode(&encoder); - return encoder.Take(); - } - - absl::optional Lookup(absl::string_view key, - std::string* buffer) const override { - if (batch_ == nullptr) return absl::nullopt; - return batch_->GetStringValue(key, buffer); - } - - private: - class Encoder final { - public: - void Encode(const Slice& key, const Slice& value) { - out_.emplace_back(std::string(key.as_string_view()), - std::string(value.as_string_view())); - } - - template - void Encode(Which, const typename Which::ValueType& value) { - auto value_slice = Which::Encode(value); - out_.emplace_back(std::string(Which::key()), - std::string(value_slice.as_string_view())); - } - - void Encode(GrpcTimeoutMetadata, - const typename GrpcTimeoutMetadata::ValueType&) {} - void Encode(HttpPathMetadata, const Slice&) {} - void Encode(HttpMethodMetadata, - const typename HttpMethodMetadata::ValueType&) {} - - std::vector> Take() { - return std::move(out_); - } - - private: - std::vector> out_; - }; - - grpc_metadata_batch* batch_; -}; - // // ClientChannelFilter::LoadBalancedCall::LbCallState // @@ -2541,7 +2466,7 @@ void ClientChannelFilter::LoadBalancedCall::RecordCallCompletion( // If the LB policy requested a callback for trailing metadata, invoke // the callback. if (lb_subchannel_call_tracker_ != nullptr) { - Metadata trailing_metadata(recv_trailing_metadata); + LbMetadata trailing_metadata(recv_trailing_metadata); BackendMetricAccessor backend_metric_accessor(this, recv_trailing_metadata); LoadBalancingPolicy::SubchannelCallTrackerInterface::FinishArgs args = { peer_address, status, &trailing_metadata, &backend_metric_accessor}; @@ -2593,16 +2518,17 @@ ClientChannelFilter::LoadBalancedCall::PickSubchannel(bool was_queued) { // updated before we queue it. // We need to unref pickers in the WorkSerializer. std::vector> pickers; - auto cleanup = absl::MakeCleanup([&]() { - if (IsWorkSerializerDispatchEnabled()) return; - chand_->work_serializer_->Run( - [pickers = std::move(pickers)]() mutable { - for (auto& picker : pickers) { - picker.reset(DEBUG_LOCATION, "PickSubchannel"); - } - }, - DEBUG_LOCATION); - }); + auto cleanup = absl::MakeCleanup( + [work_serializer = chand_->work_serializer_, &pickers]() { + if (IsWorkSerializerDispatchEnabled()) return; + work_serializer->Run( + [pickers = std::move(pickers)]() mutable { + for (auto& picker : pickers) { + picker.reset(DEBUG_LOCATION, "PickSubchannel"); + } + }, + DEBUG_LOCATION); + }); absl::AnyInvocable)> set_picker; if (!IsWorkSerializerDispatchEnabled()) { @@ -2688,7 +2614,7 @@ bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl( pick_args.path = path->as_string_view(); LbCallState lb_call_state(this); pick_args.call_state = &lb_call_state; - Metadata initial_metadata(send_initial_metadata()); + LbMetadata initial_metadata(send_initial_metadata()); pick_args.initial_metadata = &initial_metadata; auto result = picker->Pick(pick_args); return HandlePickResult( @@ -2721,6 +2647,11 @@ bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl( if (lb_subchannel_call_tracker_ != nullptr) { lb_subchannel_call_tracker_->Start(); } + // Handle metadata mutations. + MetadataMutationHandler::Apply(complete_pick->metadata_mutations, + send_initial_metadata()); + MaybeOverrideAuthority(std::move(complete_pick->authority_override), + send_initial_metadata()); return true; }, // QueuePick @@ -2847,9 +2778,8 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesFail( for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: failing %" PRIuPTR " pending batches: %s", - chand(), this, num_batches, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2889,10 +2819,9 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesResume() { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: starting %" PRIuPTR - " pending batches on subchannel_call=%p", - chand(), this, num_batches, subchannel_call_.get()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this << ": starting " + << num_batches << " pending batches on subchannel_call=" + << subchannel_call_.get(); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2915,12 +2844,10 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall:: StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch) { if (GRPC_TRACE_FLAG_ENABLED(client_channel_lb_call) || GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: batch started from above: %s, " - "call_attempt_tracer()=%p", - chand(), this, - grpc_transport_stream_op_batch_string(batch, false).c_str(), - call_attempt_tracer()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this + << ": batch started from above: " + << grpc_transport_stream_op_batch_string(batch, false) + << ", call_attempt_tracer()=" << call_attempt_tracer(); } // Handle call tracing. if (call_attempt_tracer() != nullptr) { diff --git a/deps/grpc/src/core/client_channel/client_channel_filter.h b/deps/grpc/src/core/client_channel/client_channel_filter.h index 9b119b4e02..7ecf787ca7 100644 --- a/deps/grpc/src/core/client_channel/client_channel_filter.h +++ b/deps/grpc/src/core/client_channel/client_channel_filter.h @@ -247,7 +247,7 @@ class ClientChannelFilter final { RefCountedPtr config_selector, std::string lb_policy_name) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_); - void UpdateServiceConfigInDataPlaneLocked() + void UpdateServiceConfigInDataPlaneLocked(const ChannelArgs& args) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_); void CreateResolverLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_); diff --git a/deps/grpc/src/core/client_channel/client_channel_internal.h b/deps/grpc/src/core/client_channel/client_channel_internal.h index 182da36319..b9acdd883e 100644 --- a/deps/grpc/src/core/client_channel/client_channel_internal.h +++ b/deps/grpc/src/core/client_channel/client_channel_internal.h @@ -24,8 +24,7 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include - +#include "src/core/lib/gprpp/down_cast.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_destination.h" @@ -49,6 +48,11 @@ namespace grpc_core { // LB policies to access internal call attributes. class ClientChannelLbCallState : public LoadBalancingPolicy::CallState { public: + template + A* GetCallAttribute() const { + return DownCast(GetCallAttribute(A::TypeName())); + } + virtual ServiceConfigCallData::CallAttributeInterface* GetCallAttribute( UniqueTypeName type) const = 0; virtual ClientCallTracer::CallAttemptTracer* GetCallAttemptTracer() const = 0; diff --git a/deps/grpc/src/core/client_channel/config_selector.cc b/deps/grpc/src/core/client_channel/config_selector.cc deleted file mode 100644 index 9264e4c161..0000000000 --- a/deps/grpc/src/core/client_channel/config_selector.cc +++ /dev/null @@ -1,60 +0,0 @@ -// -// Copyright 2020 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#include - -#include "src/core/client_channel/config_selector.h" - -#include "src/core/lib/channel/channel_args.h" -#include "src/core/util/useful.h" - -namespace grpc_core { - -namespace { - -void* ConfigSelectorArgCopy(void* p) { - ConfigSelector* config_selector = static_cast(p); - config_selector->Ref().release(); - return p; -} - -void ConfigSelectorArgDestroy(void* p) { - ConfigSelector* config_selector = static_cast(p); - config_selector->Unref(); -} - -int ConfigSelectorArgCmp(void* p, void* q) { return QsortCompare(p, q); } - -const grpc_arg_pointer_vtable kChannelArgVtable = { - ConfigSelectorArgCopy, ConfigSelectorArgDestroy, ConfigSelectorArgCmp}; - -} // namespace - -grpc_arg ConfigSelector::MakeChannelArg() const { - return grpc_channel_arg_pointer_create( - const_cast(GRPC_ARG_CONFIG_SELECTOR), - const_cast(this), &kChannelArgVtable); -} - -RefCountedPtr ConfigSelector::GetFromChannelArgs( - const grpc_channel_args& args) { - ConfigSelector* config_selector = - grpc_channel_args_find_pointer(&args, - GRPC_ARG_CONFIG_SELECTOR); - return config_selector != nullptr ? config_selector->Ref() : nullptr; -} - -} // namespace grpc_core diff --git a/deps/grpc/src/core/client_channel/config_selector.h b/deps/grpc/src/core/client_channel/config_selector.h index 0a0a6d54c8..1fb1ddab78 100644 --- a/deps/grpc/src/core/client_channel/config_selector.h +++ b/deps/grpc/src/core/client_channel/config_selector.h @@ -29,14 +29,15 @@ #include "absl/strings/string_view.h" #include -#include #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/interception_chain.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/util/useful.h" @@ -50,34 +51,32 @@ namespace grpc_core { // MethodConfig and provide input to LB policies on a per-call basis. class ConfigSelector : public RefCounted { public: - struct GetCallConfigArgs { - grpc_metadata_batch* initial_metadata; - Arena* arena; - ClientChannelServiceConfigCallData* service_config_call_data; - }; - ~ConfigSelector() override = default; - virtual const char* name() const = 0; + virtual UniqueTypeName name() const = 0; static bool Equals(const ConfigSelector* cs1, const ConfigSelector* cs2) { if (cs1 == nullptr) return cs2 == nullptr; if (cs2 == nullptr) return false; - if (strcmp(cs1->name(), cs2->name()) != 0) return false; + if (cs1->name() != cs2->name()) return false; return cs1->Equals(cs2); } // The channel will call this when the resolver returns a new ConfigSelector // to determine what set of dynamic filters will be configured. + virtual void AddFilters(InterceptionChainBuilder& /*builder*/) {} + // TODO(roth): Remove this once the legacy filter stack goes away. virtual std::vector GetFilters() { return {}; } - // Returns the call config to use for the call, or a status to fail - // the call with. + // Gets the configuration for the call and stores it in service config + // call data. + struct GetCallConfigArgs { + grpc_metadata_batch* initial_metadata; + Arena* arena; + ClientChannelServiceConfigCallData* service_config_call_data; + }; virtual absl::Status GetCallConfig(GetCallConfigArgs args) = 0; - grpc_arg MakeChannelArg() const; - static RefCountedPtr GetFromChannelArgs( - const grpc_channel_args& args); static absl::string_view ChannelArgName() { return GRPC_ARG_CONFIG_SELECTOR; } static int ChannelArgsCompare(const ConfigSelector* a, const ConfigSelector* b) { @@ -101,7 +100,10 @@ class DefaultConfigSelector final : public ConfigSelector { DCHECK(service_config_ != nullptr); } - const char* name() const override { return "default"; } + UniqueTypeName name() const override { + static UniqueTypeName::Factory kFactory("default"); + return kFactory.Create(); + } absl::Status GetCallConfig(GetCallConfigArgs args) override { Slice* path = args.initial_metadata->get_pointer(HttpPathMetadata()); diff --git a/deps/grpc/src/core/client_channel/direct_channel.cc b/deps/grpc/src/core/client_channel/direct_channel.cc new file mode 100644 index 0000000000..7a87774dc2 --- /dev/null +++ b/deps/grpc/src/core/client_channel/direct_channel.cc @@ -0,0 +1,83 @@ +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "src/core/client_channel/direct_channel.h" + +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/event_engine/event_engine_context.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/surface/client_call.h" +#include "src/core/lib/transport/interception_chain.h" + +namespace grpc_core { + +absl::StatusOr> DirectChannel::Create( + std::string target, const ChannelArgs& args) { + auto* transport = args.GetObject(); + if (transport == nullptr) { + return absl::InvalidArgumentError("Transport not set in ChannelArgs"); + } + if (transport->client_transport() == nullptr) { + return absl::InvalidArgumentError("Transport is not a client transport"); + } + auto transport_call_destination = MakeRefCounted( + OrphanablePtr(transport->client_transport())); + auto event_engine = + args.GetObjectRef(); + if (event_engine == nullptr) { + return absl::InvalidArgumentError("EventEngine not set in ChannelArgs"); + } + InterceptionChainBuilder builder(args); + CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( + GRPC_CLIENT_DIRECT_CHANNEL, builder); + auto interception_chain = builder.Build(transport_call_destination); + if (!interception_chain.ok()) return interception_chain.status(); + return MakeRefCounted( + std::move(target), args, std::move(event_engine), + std::move(transport_call_destination), std::move(*interception_chain)); +} + +void DirectChannel::Orphaned() { + transport_call_destination_.reset(); + interception_chain_.reset(); +} + +void DirectChannel::StartCall(UnstartedCallHandler unstarted_handler) { + unstarted_handler.SpawnInfallible( + "start", + [interception_chain = interception_chain_, unstarted_handler]() mutable { + interception_chain->StartCall(std::move(unstarted_handler)); + return []() { return Empty{}; }; + }); +} + +void DirectChannel::GetInfo(const grpc_channel_info*) { + // TODO(roth): Implement this. +} + +grpc_call* DirectChannel::CreateCall( + grpc_call* parent_call, uint32_t propagation_mask, + grpc_completion_queue* cq, grpc_pollset_set* /*pollset_set_alternative*/, + Slice path, absl::optional authority, Timestamp deadline, + bool /*registered_method*/) { + auto arena = call_arena_allocator()->MakeArena(); + arena->SetContext( + event_engine_.get()); + return MakeClientCall(parent_call, propagation_mask, cq, std::move(path), + std::move(authority), false, deadline, + compression_options(), std::move(arena), Ref()); +} + +} // namespace grpc_core diff --git a/deps/grpc/src/core/client_channel/direct_channel.h b/deps/grpc/src/core/client_channel/direct_channel.h new file mode 100644 index 0000000000..e7b0ca6094 --- /dev/null +++ b/deps/grpc/src/core/client_channel/direct_channel.h @@ -0,0 +1,101 @@ +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H + +#include + +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/transport/transport.h" + +namespace grpc_core { + +class DirectChannel final : public Channel { + public: + class TransportCallDestination final : public CallDestination { + public: + explicit TransportCallDestination(OrphanablePtr transport) + : transport_(std::move(transport)) {} + + ClientTransport* transport() { return transport_.get(); } + + void HandleCall(CallHandler handler) override { + transport_->StartCall(std::move(handler)); + } + + void Orphaned() override { transport_.reset(); } + + private: + OrphanablePtr transport_; + }; + + static absl::StatusOr> Create( + std::string target, const ChannelArgs& args); + + DirectChannel( + std::string target, const ChannelArgs& args, + std::shared_ptr + event_engine, + RefCountedPtr transport_call_destination, + RefCountedPtr interception_chain) + : Channel(std::move(target), args), + transport_call_destination_(std::move(transport_call_destination)), + interception_chain_(std::move(interception_chain)), + event_engine_(std::move(event_engine)) {} + + void Orphaned() override; + void StartCall(UnstartedCallHandler unstarted_handler) override; + bool IsLame() const override { return false; } + grpc_call* CreateCall(grpc_call* parent_call, uint32_t propagation_mask, + grpc_completion_queue* cq, + grpc_pollset_set* pollset_set_alternative, Slice path, + absl::optional authority, Timestamp deadline, + bool registered_method) override; + grpc_event_engine::experimental::EventEngine* event_engine() const override { + return event_engine_.get(); + } + bool SupportsConnectivityWatcher() const override { return false; } + grpc_connectivity_state CheckConnectivityState(bool) override { + Crash("CheckConnectivityState not supported"); + } + void WatchConnectivityState(grpc_connectivity_state, Timestamp, + grpc_completion_queue*, void*) override { + Crash("WatchConnectivityState not supported"); + } + void AddConnectivityWatcher( + grpc_connectivity_state, + OrphanablePtr) override { + Crash("AddConnectivityWatcher not supported"); + } + void RemoveConnectivityWatcher( + AsyncConnectivityStateWatcherInterface*) override { + Crash("RemoveConnectivityWatcher not supported"); + } + void GetInfo(const grpc_channel_info* channel_info) override; + void ResetConnectionBackoff() override {} + void Ping(grpc_completion_queue*, void*) override { + Crash("Ping not supported"); + } + + private: + RefCountedPtr transport_call_destination_; + RefCountedPtr interception_chain_; + const std::shared_ptr + event_engine_; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H diff --git a/deps/grpc/src/core/client_channel/dynamic_filters.cc b/deps/grpc/src/core/client_channel/dynamic_filters.cc index f901cf8b9b..f6658343e0 100644 --- a/deps/grpc/src/core/client_channel/dynamic_filters.cc +++ b/deps/grpc/src/core/client_channel/dynamic_filters.cc @@ -27,8 +27,6 @@ #include "absl/log/log.h" #include "absl/status/statusor.h" -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" @@ -78,7 +76,9 @@ void DynamicFilters::Call::StartTransportStreamOpBatch( grpc_transport_stream_op_batch* batch) { grpc_call_stack* call_stack = CALL_TO_CALL_STACK(this); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); - GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << top_elem->filter->name << ":" << top_elem + << "]: " << grpc_transport_stream_op_batch_string(batch, false); top_elem->filter->start_transport_stream_op_batch(top_elem, batch); } diff --git a/deps/grpc/src/core/client_channel/lb_metadata.cc b/deps/grpc/src/core/client_channel/lb_metadata.cc new file mode 100644 index 0000000000..cbf2a98db0 --- /dev/null +++ b/deps/grpc/src/core/client_channel/lb_metadata.cc @@ -0,0 +1,120 @@ +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "src/core/client_channel/lb_metadata.h" + +#include "absl/log/log.h" + +namespace grpc_core { + +// +// LbMetadata +// + +namespace { + +class Encoder { + public: + void Encode(const Slice& key, const Slice& value) { + out_.emplace_back(std::string(key.as_string_view()), + std::string(value.as_string_view())); + } + + template + void Encode(Which, const typename Which::ValueType& value) { + auto value_slice = Which::Encode(value); + out_.emplace_back(std::string(Which::key()), + std::string(value_slice.as_string_view())); + } + + void Encode(GrpcTimeoutMetadata, + const typename GrpcTimeoutMetadata::ValueType&) {} + void Encode(HttpPathMetadata, const Slice&) {} + void Encode(HttpMethodMetadata, + const typename HttpMethodMetadata::ValueType&) {} + + std::vector> Take() { + return std::move(out_); + } + + private: + std::vector> out_; +}; + +} // namespace + +absl::optional LbMetadata::Lookup( + absl::string_view key, std::string* buffer) const { + if (batch_ == nullptr) return absl::nullopt; + return batch_->GetStringValue(key, buffer); +} + +std::vector> +LbMetadata::TestOnlyCopyToVector() const { + if (batch_ == nullptr) return {}; + Encoder encoder; + batch_->Encode(&encoder); + return encoder.Take(); +} + +// +// MetadataMutationHandler +// + +void MetadataMutationHandler::Apply( + LoadBalancingPolicy::MetadataMutations& metadata_mutations, + grpc_metadata_batch* metadata) { + for (auto& p : metadata_mutations.metadata_) { + absl::string_view key = p.first; + Slice& value = + grpc_event_engine::experimental::internal::SliceCast(p.second); + // TODO(roth): Should we prevent this from setting special keys like + // :authority, :path, content-type, etc? + metadata->Remove(key); + // Gross, egregious hack to support legacy grpclb behavior. + // TODO(ctiller): Use a promise context for this once that plumbing is done. + if (key == GrpcLbClientStatsMetadata::key()) { + metadata->Set( + GrpcLbClientStatsMetadata(), + const_cast( + reinterpret_cast(value.data()))); + continue; + } + metadata->Append(key, std::move(value), + [key](absl::string_view error, const Slice& value) { + LOG(ERROR) << error << " key:" << key + << " value:" << value.as_string_view(); + }); + } +} + +// +// MaybeOverrideAuthority() +// + +void MaybeOverrideAuthority( + grpc_event_engine::experimental::Slice authority_override, + grpc_metadata_batch* metadata) { + // Skip if no override requested. + if (authority_override.empty()) return; + // Skip if authority already set by the application on this RPC. + if (metadata->get_pointer(HttpAuthorityMetadata()) != nullptr) return; + // Otherwise, apply override. + Slice& authority = + grpc_event_engine::experimental::internal::SliceCast( + authority_override); + metadata->Set(HttpAuthorityMetadata(), std::move(authority)); +} + +} // namespace grpc_core diff --git a/deps/grpc/src/core/client_channel/lb_metadata.h b/deps/grpc/src/core/client_channel/lb_metadata.h new file mode 100644 index 0000000000..f1c5e7e429 --- /dev/null +++ b/deps/grpc/src/core/client_channel/lb_metadata.h @@ -0,0 +1,56 @@ +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H + +#include +#include + +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include + +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/load_balancing/lb_policy.h" + +namespace grpc_core { + +class LbMetadata : public LoadBalancingPolicy::MetadataInterface { + public: + explicit LbMetadata(grpc_metadata_batch* batch) : batch_(batch) {} + + absl::optional Lookup(absl::string_view key, + std::string* buffer) const override; + + std::vector> TestOnlyCopyToVector() const; + + private: + grpc_metadata_batch* batch_; +}; + +class MetadataMutationHandler { + public: + static void Apply(LoadBalancingPolicy::MetadataMutations& metadata_mutations, + grpc_metadata_batch* metadata); +}; + +void MaybeOverrideAuthority( + grpc_event_engine::experimental::Slice authority_override, + grpc_metadata_batch* metadata); + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H diff --git a/deps/grpc/src/core/client_channel/load_balanced_call_destination.cc b/deps/grpc/src/core/client_channel/load_balanced_call_destination.cc index 51c9328919..a54a249616 100644 --- a/deps/grpc/src/core/client_channel/load_balanced_call_destination.cc +++ b/deps/grpc/src/core/client_channel/load_balanced_call_destination.cc @@ -14,8 +14,11 @@ #include "src/core/client_channel/load_balanced_call_destination.h" +#include "absl/log/log.h" + #include "src/core/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_internal.h" +#include "src/core/client_channel/lb_metadata.h" #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" @@ -26,76 +29,6 @@ namespace grpc_core { namespace { -class LbMetadata : public LoadBalancingPolicy::MetadataInterface { - public: - explicit LbMetadata(grpc_metadata_batch* batch) : batch_(batch) {} - - void Add(absl::string_view key, absl::string_view value) override { - if (batch_ == nullptr) return; - // Gross, egregious hack to support legacy grpclb behavior. - // TODO(ctiller): Use a promise context for this once that plumbing is done. - if (key == GrpcLbClientStatsMetadata::key()) { - batch_->Set( - GrpcLbClientStatsMetadata(), - const_cast( - reinterpret_cast(value.data()))); - return; - } - batch_->Append(key, Slice::FromStaticString(value), - [key](absl::string_view error, const Slice& value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat(error, " key:", key, - " value:", value.as_string_view()) - .c_str()); - }); - } - - std::vector> TestOnlyCopyToVector() - override { - if (batch_ == nullptr) return {}; - Encoder encoder; - batch_->Encode(&encoder); - return encoder.Take(); - } - - absl::optional Lookup(absl::string_view key, - std::string* buffer) const override { - if (batch_ == nullptr) return absl::nullopt; - return batch_->GetStringValue(key, buffer); - } - - private: - class Encoder { - public: - void Encode(const Slice& key, const Slice& value) { - out_.emplace_back(std::string(key.as_string_view()), - std::string(value.as_string_view())); - } - - template - void Encode(Which, const typename Which::ValueType& value) { - auto value_slice = Which::Encode(value); - out_.emplace_back(std::string(Which::key()), - std::string(value_slice.as_string_view())); - } - - void Encode(GrpcTimeoutMetadata, - const typename GrpcTimeoutMetadata::ValueType&) {} - void Encode(HttpPathMetadata, const Slice&) {} - void Encode(HttpMethodMetadata, - const typename HttpMethodMetadata::ValueType&) {} - - std::vector> Take() { - return std::move(out_); - } - - private: - std::vector> out_; - }; - - grpc_metadata_batch* batch_; -}; - void MaybeCreateCallAttemptTracer(bool is_transparent_retry) { auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; @@ -208,6 +141,11 @@ LoopCtl>> PickSubchannel( complete_pick->subchannel_call_tracker->Start(); SetContext(complete_pick->subchannel_call_tracker.release()); } + // Apply metadata mutations, if any. + MetadataMutationHandler::Apply(complete_pick->metadata_mutations, + &client_initial_metadata); + MaybeOverrideAuthority(std::move(complete_pick->authority_override), + &client_initial_metadata); // Return the connected subchannel. return call_destination; }, diff --git a/deps/grpc/src/core/client_channel/local_subchannel_pool.cc b/deps/grpc/src/core/client_channel/local_subchannel_pool.cc index f3aa73d7bd..878d3547b9 100644 --- a/deps/grpc/src/core/client_channel/local_subchannel_pool.cc +++ b/deps/grpc/src/core/client_channel/local_subchannel_pool.cc @@ -24,8 +24,6 @@ #include "absl/log/check.h" -#include - #include "src/core/client_channel/subchannel.h" namespace grpc_core { diff --git a/deps/grpc/src/core/client_channel/retry_filter.cc b/deps/grpc/src/core/client_channel/retry_filter.cc index f09d06d0e2..754a543d7e 100644 --- a/deps/grpc/src/core/client_channel/retry_filter.cc +++ b/deps/grpc/src/core/client_channel/retry_filter.cc @@ -147,7 +147,7 @@ const grpc_channel_filter RetryFilter::kVtable = { grpc_channel_stack_no_post_init, RetryFilter::Destroy, RetryFilter::GetChannelInfo, - "retry_filter", + GRPC_UNIQUE_TYPE_NAME_HERE("retry_filter"), }; } // namespace grpc_core diff --git a/deps/grpc/src/core/client_channel/retry_filter.h b/deps/grpc/src/core/client_channel/retry_filter.h index 153e2f1f00..8e30d1e7b6 100644 --- a/deps/grpc/src/core/client_channel/retry_filter.h +++ b/deps/grpc/src/core/client_channel/retry_filter.h @@ -30,7 +30,6 @@ #include #include #include -#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/retry_service_config.h" diff --git a/deps/grpc/src/core/client_channel/retry_filter_legacy_call_data.cc b/deps/grpc/src/core/client_channel/retry_filter_legacy_call_data.cc index 563795a365..4bb4bf3f9a 100644 --- a/deps/grpc/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/deps/grpc/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -22,11 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" @@ -140,22 +139,18 @@ RetryFilter::LegacyCallData::CallAttempt::CallAttempt( } }, is_transparent_retry); - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: created attempt, lb_call=%p", - calld->chand_, calld, this, lb_call_.get()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld << " attempt=" << this + << ": created attempt, lb_call=" << lb_call_.get(); // If per_attempt_recv_timeout is set, start a timer. if (calld->retry_policy_ != nullptr && calld->retry_policy_->per_attempt_recv_timeout().has_value()) { const Duration per_attempt_recv_timeout = *calld->retry_policy_->per_attempt_recv_timeout(); - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: per-attempt timeout in %" PRId64 - " ms", - calld->chand_, calld, this, per_attempt_recv_timeout.millis()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << this << ": per-attempt timeout in " + << per_attempt_recv_timeout.millis() << " ms"; // Schedule retry after computed delay. GRPC_CALL_STACK_REF(calld->owning_call_, "OnPerAttemptRecvTimer"); Ref(DEBUG_LOCATION, "OnPerAttemptRecvTimer").release(); @@ -169,10 +164,9 @@ RetryFilter::LegacyCallData::CallAttempt::CallAttempt( } RetryFilter::LegacyCallData::CallAttempt::~CallAttempt() { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: destroying call attempt", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": destroying call attempt"; } void RetryFilter::LegacyCallData::CallAttempt:: @@ -236,12 +230,11 @@ void RetryFilter::LegacyCallData::CallAttempt::MaybeSwitchToFastPath() { // yet seen that op from the surface, we can't switch yet. if (recv_trailing_metadata_internal_batch_ != nullptr) return; // Switch to fast path. - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: retry state no longer needed; " - "moving LB call to parent and unreffing the call attempt", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": retry state no longer needed; " + "moving LB call to parent and unreffing the call attempt"; calld_->committed_call_ = std::move(lb_call_); calld_->call_attempt_.reset(DEBUG_LOCATION, "MaybeSwitchToFastPath"); } @@ -255,12 +248,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { // send_initial_metadata. if (calld_->seen_send_initial_metadata_ && !started_send_initial_metadata_ && !calld_->pending_send_initial_metadata_) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_initial_metadata op", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << calld_->chand_ + << " calld=" << calld_ << " attempt=" << this + << ": replaying previously completed " + "send_initial_metadata op"; replay_batch_data = CreateBatch(1, true /* set_on_complete */); replay_batch_data->AddRetriableSendInitialMetadataOp(); } @@ -269,12 +260,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { if (started_send_message_count_ < calld_->send_messages_.size() && started_send_message_count_ == completed_send_message_count_ && !calld_->pending_send_message_) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_message op", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << calld_->chand_ + << " calld=" << calld_ << " attempt=" << this + << ": replaying previously completed " + "send_message op"; if (replay_batch_data == nullptr) { replay_batch_data = CreateBatch(1, true /* set_on_complete */); } @@ -288,12 +277,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { started_send_message_count_ == calld_->send_messages_.size() && !started_send_trailing_metadata_ && !calld_->pending_send_trailing_metadata_) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_trailing_metadata op", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << calld_->chand_ + << " calld=" << calld_ << " attempt=" << this + << ": replaying previously completed " + "send_trailing_metadata op"; if (replay_batch_data == nullptr) { replay_batch_data = CreateBatch(1, true /* set_on_complete */); } @@ -319,11 +306,10 @@ void StartBatchInCallCombiner(void* arg, grpc_error_handle /*ignored*/) { void RetryFilter::LegacyCallData::CallAttempt::AddClosureForBatch( grpc_transport_stream_op_batch* batch, const char* reason, CallCombinerClosureList* closures) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: adding batch (%s): %s", - calld_->chand_, calld_, this, reason, - grpc_transport_stream_op_batch_string(batch, false).c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": adding batch (" << reason + << "): " << grpc_transport_stream_op_batch_string(batch, false); batch->handler_private.extra_arg = lb_call_.get(); GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner, batch, grpc_schedule_on_exec_ctx); @@ -332,12 +318,11 @@ void RetryFilter::LegacyCallData::CallAttempt::AddClosureForBatch( void RetryFilter::LegacyCallData::CallAttempt:: AddBatchForInternalRecvTrailingMetadata(CallCombinerClosureList* closures) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: call failed but " - "recv_trailing_metadata not started; starting it internally", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": call failed but recv_trailing_metadata not started; " + "starting it internally"; // Create batch_data with 2 refs, since this batch will be unreffed twice: // once for the recv_trailing_metadata_ready callback when the batch // completes, and again when we actually get a recv_trailing_metadata @@ -522,22 +507,18 @@ void RetryFilter::LegacyCallData::CallAttempt::AddRetriableBatches( } void RetryFilter::LegacyCallData::CallAttempt::StartRetriableBatches() { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: constructing retriable batches", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": constructing retriable batches"; // Construct list of closures to execute, one for each pending batch. CallCombinerClosureList closures; AddRetriableBatches(&closures); // Note: This will yield the call combiner. // Start batches on LB call. - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: starting %" PRIuPTR - " retriable batches on lb_call=%p", - calld_->chand_, calld_, this, closures.size(), lb_call_.get()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": starting " << closures.size() + << " retriable batches on lb_call=" << lb_call_.get(); closures.RunClosures(calld_->call_combiner_); } @@ -560,21 +541,18 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( if (calld_->retry_throttle_data_ != nullptr) { calld_->retry_throttle_data_->RecordSuccess(); } - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: call succeeded", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": call succeeded"; return false; } // Status is not OK. Check whether the status is retryable. if (!calld_->retry_policy_->retryable_status_codes().Contains(*status)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: status %s not configured as " - "retryable", - calld_->chand_, calld_, this, - grpc_status_code_to_string(*status)); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": status " + << grpc_status_code_to_string(*status) + << " not configured as retryable"; return false; } } @@ -587,50 +565,40 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( // checks, so that we don't fail to record failures due to other factors. if (calld_->retry_throttle_data_ != nullptr && !calld_->retry_throttle_data_->RecordFailure()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: retries throttled", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": retries throttled"; return false; } // Check whether the call is committed. if (calld_->retry_committed_) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: retries already committed", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": retries already committed"; return false; } // Check whether we have retries remaining. ++calld_->num_attempts_completed_; if (calld_->num_attempts_completed_ >= calld_->retry_policy_->max_attempts()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, "chand=%p calld=%p attempt=%p: exceeded %d retry attempts", - calld_->chand_, calld_, this, calld_->retry_policy_->max_attempts()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": exceeded " + << calld_->retry_policy_->max_attempts() << " retry attempts"; return false; } // Check server push-back. if (server_pushback.has_value()) { if (*server_pushback < Duration::Zero()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: not retrying due to server " - "push-back", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": not retrying due to server push-back"; return false; } else { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, - "chand=%p calld=%p attempt=%p: server push-back: retry in %" PRIu64 - " ms", - calld_->chand_, calld_, this, server_pushback->millis()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": server push-back: retry in " + << server_pushback->millis() << " ms"; } } // We should retry. @@ -674,13 +642,12 @@ void RetryFilter::LegacyCallData::CallAttempt::OnPerAttemptRecvTimerLocked( void* arg, grpc_error_handle error) { auto* call_attempt = static_cast(arg); auto* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: perAttemptRecvTimeout timer fired: " - "error=%s, per_attempt_recv_timer_handle_.has_value()=%d", - calld->chand_, calld, call_attempt, StatusToString(error).c_str(), - call_attempt->per_attempt_recv_timer_handle_.has_value()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": perAttemptRecvTimeout timer fired: error=" << StatusToString(error) + << ", per_attempt_recv_timer_handle_.has_value()=" + << call_attempt->per_attempt_recv_timer_handle_.has_value(); CallCombinerClosureList closures; call_attempt->per_attempt_recv_timer_handle_.reset(); // Cancel this attempt. @@ -713,12 +680,9 @@ void RetryFilter::LegacyCallData::CallAttempt::OnPerAttemptRecvTimerLocked( void RetryFilter::LegacyCallData::CallAttempt:: MaybeCancelPerAttemptRecvTimer() { if (per_attempt_recv_timer_handle_.has_value()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: cancelling " - "perAttemptRecvTimeout timer", - calld_->chand_, calld_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": cancelling perAttemptRecvTimeout timer"; if (calld_->chand_->event_engine()->Cancel( *per_attempt_recv_timer_handle_)) { Unref(DEBUG_LOCATION, "OnPerAttemptRecvTimer"); @@ -737,11 +701,10 @@ RetryFilter::LegacyCallData::CallAttempt::BatchData::BatchData( : RefCounted(GRPC_TRACE_FLAG_ENABLED(retry) ? "BatchData" : nullptr, refcount), call_attempt_(attempt.release()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: creating batch %p", - call_attempt_->calld_->chand_, call_attempt_->calld_, call_attempt_, - this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << call_attempt_->calld_->chand_ + << " calld=" << call_attempt_->calld_ << " attempt=" << call_attempt_ + << ": creating batch " << this; // We hold a ref to the call stack for every batch sent on a call attempt. // This is because some batches on the call attempt may not complete // until after all of the batches are completed at the surface (because @@ -758,11 +721,10 @@ RetryFilter::LegacyCallData::CallAttempt::BatchData::BatchData( } RetryFilter::LegacyCallData::CallAttempt::BatchData::~BatchData() { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: destroying batch %p", - call_attempt_->calld_->chand_, call_attempt_->calld_, call_attempt_, - this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << call_attempt_->calld_->chand_ + << " calld=" << call_attempt_->calld_ << " attempt=" << call_attempt_ + << ": destroying batch " << this; CallAttempt* call_attempt = std::exchange(call_attempt_, nullptr); grpc_call_stack* owning_call = call_attempt->calld_->owning_call_; call_attempt->Unref(DEBUG_LOCATION, "~BatchData"); @@ -831,13 +793,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: RefCountedPtr batch_data(static_cast(arg)); CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_initial_metadata_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << " batch_data=" << batch_data.get() + << ": got recv_initial_metadata_ready, error=" << StatusToString(error); call_attempt->completed_recv_initial_metadata_ = true; // If this attempt has been abandoned, then we're not going to use the // result of this recv_initial_metadata op, so do nothing. @@ -858,12 +817,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: if (GPR_UNLIKELY( (call_attempt->trailing_metadata_available_ || !error.ok()) && !call_attempt->completed_recv_trailing_metadata_)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: deferring " - "recv_initial_metadata_ready (Trailers-Only)", - calld->chand_, calld, call_attempt); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": deferring recv_initial_metadata_ready (Trailers-Only)"; call_attempt->recv_initial_metadata_ready_deferred_batch_ = std::move(batch_data); call_attempt->recv_initial_metadata_error_ = error; @@ -930,13 +887,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::RecvMessageReady( RefCountedPtr batch_data(static_cast(arg)); CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_message_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << " batch_data=" << batch_data.get() + << ": got recv_message_ready, error=" << StatusToString(error); ++call_attempt->completed_recv_message_count_; // If this attempt has been abandoned, then we're not going to use the // result of this recv_message op, so do nothing. @@ -960,12 +914,11 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::RecvMessageReady( if (GPR_UNLIKELY( (!call_attempt->recv_message_.has_value() || !error.ok()) && !call_attempt->completed_recv_trailing_metadata_)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: deferring recv_message_ready " - "(nullptr message and recv_trailing_metadata pending)", - calld->chand_, calld, call_attempt); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": deferring recv_message_ready (nullptr message and " + "recv_trailing_metadata pending)"; call_attempt->recv_message_ready_deferred_batch_ = std::move(batch_data); call_attempt->recv_message_error_ = error; CallCombinerClosureList closures; @@ -1124,13 +1077,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: RefCountedPtr batch_data(static_cast(arg)); CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_trailing_metadata_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << " batch_data=" << batch_data.get() + << ": got recv_trailing_metadata_ready, error=" << StatusToString(error); call_attempt->completed_recv_trailing_metadata_ = true; // If this attempt has been abandoned, then we're not going to use the // result of this recv_trailing_metadata op, so do nothing. @@ -1151,19 +1101,15 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: batch_data->batch_.payload->recv_trailing_metadata.recv_trailing_metadata; GetCallStatus(calld->deadline_, md_batch, error, &status, &server_pushback, &is_lb_drop, &stream_network_state); - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: call finished, status=%s " - "server_pushback=%s is_lb_drop=%d stream_network_state=%s", - calld->chand_, calld, call_attempt, - grpc_status_code_to_string(status), - server_pushback.has_value() ? server_pushback->ToString().c_str() - : "N/A", - is_lb_drop, - stream_network_state.has_value() - ? absl::StrCat(*stream_network_state).c_str() - : "N/A"); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": call finished, status=" << grpc_status_code_to_string(status) + << " server_pushback=" + << (server_pushback.has_value() ? server_pushback->ToString() : "N/A") + << " is_lb_drop=" << is_lb_drop << " stream_network_state=" + << (stream_network_state.has_value() ? absl::StrCat(*stream_network_state) + : "N/A"); // Check if we should retry. if (!is_lb_drop) { // Never retry on LB drops. enum { kNoRetry, kTransparentRetry, kConfigurableRetry } retry = kNoRetry; @@ -1272,12 +1218,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: } } if (have_pending_send_ops) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: starting next batch for pending " - "send op(s)", - calld->chand_, calld, call_attempt_); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt_ + << ": starting next batch for pending send op(s)"; call_attempt_->AddRetriableBatches(closures); } } @@ -1287,15 +1231,11 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnComplete( RefCountedPtr batch_data(static_cast(arg)); CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got on_complete, error=%s, batch=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str(), - grpc_transport_stream_op_batch_string(&batch_data->batch_, false) - .c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << " batch_data=" << batch_data.get() + << ": got on_complete, error=" << StatusToString(error) << ", batch=" + << grpc_transport_stream_op_batch_string(&batch_data->batch_, false); // If this attempt has been abandoned, then we're not going to propagate // the completion of this batch, so do nothing. if (call_attempt->abandoned_) { @@ -1309,10 +1249,9 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnComplete( // recv_trailing_metadata comes back. if (GPR_UNLIKELY(!calld->retry_committed_ && !error.ok() && !call_attempt->completed_recv_trailing_metadata_)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: deferring on_complete", - calld->chand_, calld, call_attempt); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << ": deferring on_complete"; call_attempt->on_complete_deferred_batches_.emplace_back( std::move(batch_data), error); CallCombinerClosureList closures; @@ -1363,20 +1302,16 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnCompleteForCancelOp( RefCountedPtr batch_data(static_cast(arg)); CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got on_complete for cancel_stream batch, error=%s, batch=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str(), - grpc_transport_stream_op_batch_string(&batch_data->batch_, false) - .c_str()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << " batch_data=" << batch_data.get() + << ": got on_complete for cancel_stream batch, error=" + << StatusToString(error) << ", batch=" + << grpc_transport_stream_op_batch_string(&batch_data->batch_, false); GRPC_CALL_COMBINER_STOP( calld->call_combiner_, "on_complete for internally generated cancel_stream op"); } - // // retriable batch construction // @@ -1407,14 +1342,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: void RetryFilter::LegacyCallData::CallAttempt::BatchData:: AddRetriableSendMessageOp() { auto* calld = call_attempt_->calld_; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, - "chand=%p calld=%p attempt=%p: starting calld->send_messages[%" PRIuPTR - "]", - calld->chand_, calld, call_attempt_, - call_attempt_->started_send_message_count_); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt_ << ": starting calld->send_messages[" + << call_attempt_->started_send_message_count_ << "]"; CachedSendMessage cache = calld->send_messages_[call_attempt_->started_send_message_count_]; ++call_attempt_->started_send_message_count_; @@ -1496,10 +1427,8 @@ grpc_error_handle RetryFilter::LegacyCallData::Init( grpc_call_element* elem, const grpc_call_element_args* args) { auto* chand = static_cast(elem->channel_data); new (elem->call_data) RetryFilter::LegacyCallData(chand, *args); - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: created call", chand, - elem->call_data); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand << " calld=" << elem->call_data << ": created call"; return absl::OkStatus(); } @@ -1579,9 +1508,9 @@ RetryFilter::LegacyCallData::~LegacyCallData() { void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( grpc_transport_stream_op_batch* batch) { if (GRPC_TRACE_FLAG_ENABLED(retry) && !GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: batch started from surface: %s", - chand_, this, - grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": batch started from surface: " + << grpc_transport_stream_op_batch_string(batch, false); } // If we have an LB call, delegate to the LB call. if (committed_call_ != nullptr) { @@ -1601,10 +1530,9 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( if (GPR_UNLIKELY(batch->cancel_stream)) { // Save cancel_error in case subsequent batches are started. cancelled_from_surface_ = batch->payload->cancel_stream.cancel_error; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: cancelled from surface: %s", chand_, - this, StatusToString(cancelled_from_surface_).c_str()); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": cancelled from surface: " + << StatusToString(cancelled_from_surface_); // Fail any pending batches. PendingBatchesFail(cancelled_from_surface_); // If we have a current call attempt, commit the call, then send @@ -1624,10 +1552,8 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( } // Cancel retry timer if needed. if (retry_timer_handle_.has_value()) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: cancelling retry timer", chand_, - this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": cancelling retry timer"; if (chand_->event_engine()->Cancel(*retry_timer_handle_)) { GRPC_CALL_STACK_UNREF(owning_call_, "OnRetryTimer"); } @@ -1670,12 +1596,9 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( if (!retry_codepath_started_ && retry_committed_ && (retry_policy_ == nullptr || !retry_policy_->per_attempt_recv_timeout().has_value())) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: retry committed before first attempt; " - "creating LB call", - chand_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this + << ": retry committed before first attempt; creating LB call"; PendingBatchClear(pending); auto* service_config_call_data = DownCast( @@ -1689,19 +1612,16 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( // Otherwise, create a call attempt. // The attempt will automatically start any necessary replays or // pending batches. - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: creating call attempt", chand_, - this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this << ": creating call attempt"; retry_codepath_started_ = true; CreateCallAttempt(/*is_transparent_retry=*/false); return; } // Send batches to call attempt. - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: starting batch on attempt=%p", chand_, - this, call_attempt_.get()); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this + << ": starting batch on attempt=" << call_attempt_.get(); call_attempt_->StartRetriableBatches(); } @@ -1756,29 +1676,22 @@ void RetryFilter::LegacyCallData::MaybeCacheSendOpsForBatch( } void RetryFilter::LegacyCallData::FreeCachedSendInitialMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: destroying send_initial_metadata", - chand_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_initial_metadata"; send_initial_metadata_.Clear(); } void RetryFilter::LegacyCallData::FreeCachedSendMessage(size_t idx) { if (send_messages_[idx].slices != nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: destroying send_messages[%" PRIuPTR "]", - chand_, this, idx); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_messages[" << idx << "]"; Destruct(std::exchange(send_messages_[idx].slices, nullptr)); } } void RetryFilter::LegacyCallData::FreeCachedSendTrailingMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: destroying send_trailing_metadata", - chand_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_trailing_metadata"; send_trailing_metadata_.Clear(); } @@ -1814,11 +1727,8 @@ RetryFilter::LegacyCallData::PendingBatch* RetryFilter::LegacyCallData::PendingBatchesAdd( grpc_transport_stream_op_batch* batch) { const size_t idx = GetBatchIndex(batch); - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: adding pending batch at index %" PRIuPTR, - chand_, this, idx); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": adding pending batch at index " << idx; PendingBatch* pending = &pending_batches_[idx]; CHECK_EQ(pending->batch, nullptr); pending->batch = batch; @@ -1845,11 +1755,8 @@ RetryFilter::LegacyCallData::PendingBatchesAdd( // ops have already been sent, and we commit to that attempt. if (GPR_UNLIKELY(bytes_buffered_for_retry_ > chand_->per_rpc_retry_buffer_size())) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: exceeded retry buffer size, committing", - chand_, this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": exceeded retry buffer size, committing"; RetryCommit(call_attempt_.get()); } return pending; @@ -1882,10 +1789,8 @@ void RetryFilter::LegacyCallData::MaybeClearPendingBatch( (!batch->recv_trailing_metadata || batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready == nullptr)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: clearing pending batch", chand_, - this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": clearing pending batch"; PendingBatchClear(pending); } } @@ -1910,9 +1815,8 @@ void RetryFilter::LegacyCallData::PendingBatchesFail(grpc_error_handle error) { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i].batch != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s", - chand_, this, num_batches, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -1939,11 +1843,9 @@ RetryFilter::LegacyCallData::PendingBatchFind(const char* log_message, PendingBatch* pending = &pending_batches_[i]; grpc_transport_stream_op_batch* batch = pending->batch; if (batch != nullptr && predicate(batch)) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: %s pending batch at index %" PRIuPTR, - chand_, this, log_message, i); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this << ": " << log_message + << " pending batch at index " << i; return pending; } } @@ -1957,9 +1859,8 @@ RetryFilter::LegacyCallData::PendingBatchFind(const char* log_message, void RetryFilter::LegacyCallData::RetryCommit(CallAttempt* call_attempt) { if (retry_committed_) return; retry_committed_ = true; - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: committing retries", chand_, this); - } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this << ": committing retries"; if (call_attempt != nullptr) { // If the call attempt's LB call has been committed, invoke the // call's on_commit callback. @@ -1989,13 +1890,11 @@ void RetryFilter::LegacyCallData::StartRetryTimer( next_attempt_timeout = *server_pushback; retry_backoff_.Reset(); } else { - next_attempt_timeout = retry_backoff_.NextAttemptTime() - Timestamp::Now(); - } - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: retrying failed call in %" PRId64 " ms", chand_, - this, next_attempt_timeout.millis()); + next_attempt_timeout = retry_backoff_.NextAttemptDelay(); } + GRPC_TRACE_LOG(retry, INFO) + << "chand=" << chand_ << " calld=" << this << ": retrying failed call in " + << next_attempt_timeout.millis() << " ms"; // Schedule retry after computed delay. GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer"); retry_timer_handle_ = @@ -2024,10 +1923,8 @@ void RetryFilter::LegacyCallData::OnRetryTimerLocked( void RetryFilter::LegacyCallData::AddClosureToStartTransparentRetry( CallCombinerClosureList* closures) { - if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: scheduling transparent retry", chand_, - this); - } + GRPC_TRACE_LOG(retry, INFO) << "chand=" << chand_ << " calld=" << this + << ": scheduling transparent retry"; GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer"); GRPC_CLOSURE_INIT(&retry_closure_, StartTransparentRetry, this, nullptr); closures->Add(&retry_closure_, absl::OkStatus(), "start transparent retry"); diff --git a/deps/grpc/src/core/client_channel/subchannel.cc b/deps/grpc/src/core/client_channel/subchannel.cc index 19475ce804..298c7d7851 100644 --- a/deps/grpc/src/core/client_channel/subchannel.cc +++ b/deps/grpc/src/core/client_channel/subchannel.cc @@ -37,7 +37,6 @@ #include #include #include -#include #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" @@ -98,14 +97,11 @@ using ::grpc_event_engine::experimental::EventEngine; // ConnectedSubchannel // -ConnectedSubchannel::ConnectedSubchannel( - const ChannelArgs& args, - RefCountedPtr channelz_subchannel) +ConnectedSubchannel::ConnectedSubchannel(const ChannelArgs& args) : RefCounted( GRPC_TRACE_FLAG_ENABLED(subchannel_refcount) ? "ConnectedSubchannel" : nullptr), - args_(args), - channelz_subchannel_(std::move(channelz_subchannel)) {} + args_(args) {} // // LegacyConnectedSubchannel @@ -115,14 +111,19 @@ class LegacyConnectedSubchannel : public ConnectedSubchannel { public: LegacyConnectedSubchannel( RefCountedPtr channel_stack, const ChannelArgs& args, - RefCountedPtr channelz_subchannel) - : ConnectedSubchannel(args, std::move(channelz_subchannel)), + RefCountedPtr channelz_node) + : ConnectedSubchannel(args), + channelz_node_(std::move(channelz_node)), channel_stack_(std::move(channel_stack)) {} ~LegacyConnectedSubchannel() override { channel_stack_.reset(DEBUG_LOCATION, "ConnectedSubchannel"); } + channelz::SubchannelNode* channelz_node() const { + return channelz_node_.get(); + } + void StartWatch( grpc_pollset_set* interested_parties, OrphanablePtr watcher) override { @@ -163,6 +164,7 @@ class LegacyConnectedSubchannel : public ConnectedSubchannel { } private: + RefCountedPtr channelz_node_; RefCountedPtr channel_stack_; }; @@ -192,9 +194,8 @@ class NewConnectedSubchannel : public ConnectedSubchannel { NewConnectedSubchannel( RefCountedPtr call_destination, RefCountedPtr transport, - const ChannelArgs& args, - RefCountedPtr channelz_subchannel) - : ConnectedSubchannel(args, std::move(channelz_subchannel)), + const ChannelArgs& args) + : ConnectedSubchannel(args), call_destination_(std::move(call_destination)), transport_(std::move(transport)) {} @@ -241,7 +242,8 @@ RefCountedPtr SubchannelCall::Create(Args args, } SubchannelCall::SubchannelCall(Args args, grpc_error_handle* error) - : connected_subchannel_(std::move(args.connected_subchannel)), + : connected_subchannel_(args.connected_subchannel + .TakeAsSubclass()), deadline_(args.deadline) { grpc_call_stack* callstk = SUBCHANNEL_CALL_TO_CALL_STACK(this); const grpc_call_element_args call_args = { @@ -260,7 +262,7 @@ SubchannelCall::SubchannelCall(Args args, grpc_error_handle* error) return; } grpc_call_stack_set_pollset_or_pollset_set(callstk, args.pollent); - auto* channelz_node = connected_subchannel_->channelz_subchannel(); + auto* channelz_node = connected_subchannel_->channelz_node(); if (channelz_node != nullptr) { channelz_node->RecordCallStarted(); } @@ -271,7 +273,9 @@ void SubchannelCall::StartTransportStreamOpBatch( MaybeInterceptRecvTrailingMetadata(batch); grpc_call_stack* call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(this); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); - GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << top_elem->filter->name << ":" << top_elem + << "]: " << grpc_transport_stream_op_batch_string(batch, false); top_elem->filter->start_transport_stream_op_batch(top_elem, batch); } @@ -326,13 +330,9 @@ void SubchannelCall::Destroy(void* arg, grpc_error_handle /*error*/) { void SubchannelCall::MaybeInterceptRecvTrailingMetadata( grpc_transport_stream_op_batch* batch) { // only intercept payloads with recv trailing. - if (!batch->recv_trailing_metadata) { - return; - } + if (!batch->recv_trailing_metadata) return; // only add interceptor is channelz is enabled. - if (connected_subchannel_->channelz_subchannel() == nullptr) { - return; - } + if (connected_subchannel_->channelz_node() == nullptr) return; GRPC_CLOSURE_INIT(&recv_trailing_metadata_ready_, RecvTrailingMetadataReady, this, grpc_schedule_on_exec_ctx); // save some state needed for the interception callback. @@ -365,13 +365,13 @@ void SubchannelCall::RecvTrailingMetadataReady(void* arg, CHECK_NE(call->recv_trailing_metadata_, nullptr); grpc_status_code status = GRPC_STATUS_OK; GetCallStatus(&status, call->deadline_, call->recv_trailing_metadata_, error); - channelz::SubchannelNode* channelz_subchannel = - call->connected_subchannel_->channelz_subchannel(); - CHECK_NE(channelz_subchannel, nullptr); + channelz::SubchannelNode* channelz_node = + call->connected_subchannel_->channelz_node(); + CHECK_NE(channelz_node, nullptr); if (status == GRPC_STATUS_OK) { - channelz_subchannel->RecordCallSucceeded(); + channelz_node->RecordCallSucceeded(); } else { - channelz_subchannel->RecordCallFailed(); + channelz_node->RecordCallFailed(); } Closure::Run(DEBUG_LOCATION, call->original_recv_trailing_metadata_, error); } @@ -417,12 +417,11 @@ class Subchannel::ConnectedSubchannelStateWatcher final if (c->connected_subchannel_ == nullptr) return; if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE || new_state == GRPC_CHANNEL_SHUTDOWN) { - if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, - "subchannel %p %s: Connected subchannel %p reports %s: %s", c, - c->key_.ToString().c_str(), c->connected_subchannel_.get(), - ConnectivityStateName(new_state), status.ToString().c_str()); - } + GRPC_TRACE_LOG(subchannel, INFO) + << "subchannel " << c << " " << c->key_.ToString() + << ": Connected subchannel " << c->connected_subchannel_.get() + << " reports " << ConnectivityStateName(new_state) << ": " + << status; c->connected_subchannel_.reset(); if (c->channelz_node() != nullptr) { c->channelz_node()->SetChildSocket(nullptr); @@ -602,10 +601,9 @@ void Subchannel::ThrottleKeepaliveTime(int new_keepalive_time) { // Only update the value if the new keepalive time is larger. if (new_keepalive_time > keepalive_time_) { keepalive_time_ = new_keepalive_time; - if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, "subchannel %p %s: throttling keepalive time to %d", - this, key_.ToString().c_str(), new_keepalive_time); - } + GRPC_TRACE_LOG(subchannel, INFO) + << "subchannel " << this << " " << key_.ToString() + << ": throttling keepalive time to " << new_keepalive_time; args_ = args_.Set(GRPC_ARG_KEEPALIVE_TIME_MS, new_keepalive_time); } } @@ -758,17 +756,17 @@ void Subchannel::OnRetryTimer() { void Subchannel::OnRetryTimerLocked() { if (shutdown_) return; - if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - LOG(INFO) << "subchannel " << this << " " << key_.ToString() - << ": backoff delay elapsed, reporting IDLE"; - } + GRPC_TRACE_LOG(subchannel, INFO) + << "subchannel " << this << " " << key_.ToString() + << ": backoff delay elapsed, reporting IDLE"; SetConnectivityStateLocked(GRPC_CHANNEL_IDLE, absl::OkStatus()); } void Subchannel::StartConnectingLocked() { // Set next attempt time. - const Timestamp min_deadline = min_connect_timeout_ + Timestamp::Now(); - next_attempt_time_ = backoff_.NextAttemptTime(); + const Timestamp now = Timestamp::Now(); + const Timestamp min_deadline = now + min_connect_timeout_; + next_attempt_time_ = now + backoff_.NextAttemptDelay(); // Report CONNECTING. SetConnectivityStateLocked(GRPC_CHANNEL_CONNECTING, absl::OkStatus()); // Start connection attempt. @@ -805,12 +803,10 @@ void Subchannel::OnConnectingFinishedLocked(grpc_error_handle error) { if (connecting_result_.transport == nullptr || !PublishTransportLocked()) { const Duration time_until_next_attempt = next_attempt_time_ - Timestamp::Now(); - if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - LOG(INFO) << "subchannel " << this << " " << key_.ToString() - << ": connect failed (" << StatusToString(error) - << "), backing off for " << time_until_next_attempt.millis() - << " ms"; - } + GRPC_TRACE_LOG(subchannel, INFO) + << "subchannel " << this << " " << key_.ToString() + << ": connect failed (" << StatusToString(error) + << "), backing off for " << time_until_next_attempt.millis() << " ms"; SetConnectivityStateLocked(GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_to_absl_status(error)); retry_timer_handle_ = event_engine_->RunAfter( @@ -847,9 +843,8 @@ bool Subchannel::PublishTransportLocked() { absl::StatusOr> stack = builder.Build(); if (!stack.ok()) { connecting_result_.Reset(); - gpr_log(GPR_ERROR, - "subchannel %p %s: error initializing subchannel stack: %s", this, - key_.ToString().c_str(), stack.status().ToString().c_str()); + LOG(ERROR) << "subchannel " << this << " " << key_.ToString() + << ": error initializing subchannel stack: " << stack.status(); return false; } connected_subchannel_ = MakeRefCounted( @@ -860,6 +855,24 @@ bool Subchannel::PublishTransportLocked() { ->client_transport()); InterceptionChainBuilder builder( connecting_result_.channel_args.SetObject(transport.get())); + if (channelz_node_ != nullptr) { + // TODO(ctiller): If/when we have a good way to access the subchannel + // from a filter (maybe GetContext?), consider replacing + // these two hooks with a filter so that we can avoid storing two + // separate refs to the channelz node in each connection. + builder.AddOnClientInitialMetadata( + [channelz_node = channelz_node_](ClientMetadata&) { + channelz_node->RecordCallStarted(); + }); + builder.AddOnServerTrailingMetadata( + [channelz_node = channelz_node_](ServerMetadata& metadata) { + if (IsStatusOk(metadata)) { + channelz_node->RecordCallSucceeded(); + } else { + channelz_node->RecordCallFailed(); + } + }); + } CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( GRPC_CLIENT_SUBCHANNEL, builder); auto transport_destination = @@ -868,22 +881,19 @@ bool Subchannel::PublishTransportLocked() { auto call_destination = builder.Build(transport_destination); if (!call_destination.ok()) { connecting_result_.Reset(); - gpr_log(GPR_ERROR, - "subchannel %p %s: error initializing subchannel stack: %s", this, - key_.ToString().c_str(), - call_destination.status().ToString().c_str()); + LOG(ERROR) << "subchannel " << this << " " << key_.ToString() + << ": error initializing subchannel stack: " + << call_destination.status(); return false; } connected_subchannel_ = MakeRefCounted( - std::move(*call_destination), std::move(transport_destination), args_, - channelz_node_); + std::move(*call_destination), std::move(transport_destination), args_); } connecting_result_.Reset(); // Publish. - if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, "subchannel %p %s: new connected subchannel at %p", this, - key_.ToString().c_str(), connected_subchannel_.get()); - } + GRPC_TRACE_LOG(subchannel, INFO) + << "subchannel " << this << " " << key_.ToString() + << ": new connected subchannel at " << connected_subchannel_.get(); if (channelz_node_ != nullptr) { channelz_node_->SetChildSocket(std::move(socket_node)); } diff --git a/deps/grpc/src/core/client_channel/subchannel.h b/deps/grpc/src/core/client_channel/subchannel.h index 78c7895868..6ae44a5675 100644 --- a/deps/grpc/src/core/client_channel/subchannel.h +++ b/deps/grpc/src/core/client_channel/subchannel.h @@ -66,9 +66,6 @@ class SubchannelCall; class ConnectedSubchannel : public RefCounted { public: const ChannelArgs& args() const { return args_; } - channelz::SubchannelNode* channelz_subchannel() const { - return channelz_subchannel_.get(); - } virtual void StartWatch( grpc_pollset_set* interested_parties, @@ -85,17 +82,14 @@ class ConnectedSubchannel : public RefCounted { virtual void Ping(grpc_closure* on_initiate, grpc_closure* on_ack) = 0; protected: - ConnectedSubchannel( - const ChannelArgs& args, - RefCountedPtr channelz_subchannel); + explicit ConnectedSubchannel(const ChannelArgs& args); private: ChannelArgs args_; - // ref counted pointer to the channelz node in this connected subchannel's - // owning subchannel. - RefCountedPtr channelz_subchannel_; }; +class LegacyConnectedSubchannel; + // Implements the interface of RefCounted<>. class SubchannelCall final { public: @@ -150,7 +144,7 @@ class SubchannelCall final { static void Destroy(void* arg, grpc_error_handle error); - RefCountedPtr connected_subchannel_; + RefCountedPtr connected_subchannel_; grpc_closure* after_call_stack_destroy_ = nullptr; // State needed to support channelz interception of recv trailing metadata. grpc_closure recv_trailing_metadata_ready_; diff --git a/deps/grpc/src/core/client_channel/subchannel_stream_client.cc b/deps/grpc/src/core/client_channel/subchannel_stream_client.cc index d7f14b40cf..afdafe398e 100644 --- a/deps/grpc/src/core/client_channel/subchannel_stream_client.cc +++ b/deps/grpc/src/core/client_channel/subchannel_stream_client.cc @@ -130,7 +130,7 @@ void SubchannelStreamClient::StartRetryTimerLocked() { if (event_handler_ != nullptr) { event_handler_->OnRetryTimerStartLocked(this); } - const Duration timeout = retry_backoff_.NextAttemptTime() - Timestamp::Now(); + const Duration timeout = retry_backoff_.NextAttemptDelay(); if (GPR_UNLIKELY(tracer_ != nullptr)) { LOG(INFO) << tracer_ << " " << this << ": SubchannelStreamClient health check call lost..."; diff --git a/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index 082efb9716..647ff45c30 100644 --- a/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -24,13 +24,13 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" #include "xds/data/orca/v3/orca_load_report.upb.h" #include -#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" @@ -117,8 +117,7 @@ absl::optional MaybeSerializeBackendMetrics( } // namespace const grpc_channel_filter BackendMetricFilter::kFilter = - MakePromiseBasedFilter( - "backend_metric"); + MakePromiseBasedFilter(); absl::StatusOr> BackendMetricFilter::Create(const ChannelArgs&, ChannelFilter::Args) { @@ -129,21 +128,20 @@ void BackendMetricFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { if (md.get(GrpcCallWasCancelled()).value_or(false)) return; auto* ctx = MaybeGetContext(); if (ctx == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] No BackendMetricProvider.", this); - } + GRPC_TRACE_LOG(backend_metric_filter, INFO) + << "[" << this << "] No BackendMetricProvider."; return; } absl::optional serialized = MaybeSerializeBackendMetrics(ctx); if (serialized.has_value() && !serialized->empty()) { - if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] Backend metrics serialized. size: %" PRIuPTR, - this, serialized->size()); - } + GRPC_TRACE_LOG(backend_metric_filter, INFO) + << "[" << this + << "] Backend metrics serialized. size: " << serialized->size(); md.Set(EndpointLoadMetricsBinMetadata(), Slice::FromCopiedString(std::move(*serialized))); - } else if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] No backend metrics.", this); + } else { + GRPC_TRACE_LOG(backend_metric_filter, INFO) + << "[" << this << "] No backend metrics."; } } diff --git a/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.h index 114fc3cc7b..02ee8611dc 100644 --- a/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.h +++ b/deps/grpc/src/core/ext/filters/backend_metrics/backend_metric_filter.h @@ -35,6 +35,8 @@ class BackendMetricFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "backend_metric"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args); diff --git a/deps/grpc/src/core/ext/filters/census/grpc_context.cc b/deps/grpc/src/core/ext/filters/census/grpc_context.cc index e2affd09a4..77965df7ec 100644 --- a/deps/grpc/src/core/ext/filters/census/grpc_context.cc +++ b/deps/grpc/src/core/ext/filters/census/grpc_context.cc @@ -22,18 +22,18 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" void grpc_census_call_set_context(grpc_call* call, census_context* context) { - GRPC_API_TRACE("grpc_census_call_set_context(call=%p, census_context=%p)", 2, - (call, context)); + GRPC_TRACE_LOG(api, INFO) << "grpc_census_call_set_context(call=" << call + << ", census_context=" << context << ")"; if (context != nullptr) { grpc_call_get_arena(call)->SetContext(context); } } census_context* grpc_census_call_get_context(grpc_call* call) { - GRPC_API_TRACE("grpc_census_call_get_context(call=%p)", 1, (call)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_census_call_get_context(call=" << call << ")"; return grpc_call_get_arena(call)->GetContext(); } diff --git a/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index c2e82de449..b560b92f59 100644 --- a/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc @@ -29,7 +29,6 @@ #include "absl/types/optional.h" #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" @@ -51,6 +50,7 @@ #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" +#include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" @@ -70,13 +70,6 @@ const auto kMaxConnectionAgeJitter = 0.1; } // namespace -#define GRPC_IDLE_FILTER_LOG(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(client_idle_filter)) { \ - gpr_log(GPR_INFO, "(client idle filter) " format, ##__VA_ARGS__); \ - } \ - } while (0) - Duration GetClientIdleTimeout(const ChannelArgs& args) { return args.GetDurationFromIntMillis(GRPC_ARG_CLIENT_IDLE_TIMEOUT_MS) .value_or(kDefaultIdleTimeout); @@ -176,6 +169,9 @@ void LegacyMaxAgeFilter::PostInit() { // Start the max age timer if (max_connection_age_ != Duration::Infinity()) { + auto arena = SimpleArenaAllocator(0)->MakeArena(); + arena->SetContext( + channel_stack->EventEngine()); max_age_activity_.Set(MakeActivity( TrySeq( // First sleep until the max connection age @@ -213,7 +209,7 @@ void LegacyMaxAgeFilter::PostInit() { // (if it did not, it was cancelled) if (status.ok()) CloseChannel(); }, - channel_stack->EventEngine())); + std::move(arena))); } } @@ -255,7 +251,8 @@ void LegacyChannelIdleFilter::DecreaseCallCount() { } void LegacyChannelIdleFilter::StartIdleTimer() { - GRPC_IDLE_FILTER_LOG("timer has started"); + GRPC_TRACE_LOG(client_idle_filter, INFO) + << "(client idle filter) timer has started"; auto idle_filter_state = idle_filter_state_; // Hold a ref to the channel stack for the timer callback. auto channel_stack = channel_stack_->Ref(); @@ -270,12 +267,15 @@ void LegacyChannelIdleFilter::StartIdleTimer() { } }); }); + auto arena = SimpleArenaAllocator()->MakeArena(); + arena->SetContext( + channel_stack_->EventEngine()); activity_.Set(MakeActivity( std::move(promise), ExecCtxWakeupScheduler{}, [channel_stack, this](absl::Status status) { if (status.ok()) CloseChannel(); }, - channel_stack->EventEngine())); + std::move(arena))); } void LegacyChannelIdleFilter::CloseChannel() { @@ -289,11 +289,9 @@ void LegacyChannelIdleFilter::CloseChannel() { } const grpc_channel_filter LegacyClientIdleFilter::kFilter = - MakePromiseBasedFilter( - "client_idle"); + MakePromiseBasedFilter(); const grpc_channel_filter LegacyMaxAgeFilter::kFilter = - MakePromiseBasedFilter( - "max_age"); + MakePromiseBasedFilter(); void RegisterLegacyChannelIdleFilters(CoreConfiguration::Builder* builder) { builder->channel_init() diff --git a/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index 001282276f..9ee7981b2f 100644 --- a/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/deps/grpc/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -96,6 +96,8 @@ class LegacyClientIdleFilter final : public LegacyChannelIdleFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "client_idle"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -107,6 +109,8 @@ class LegacyMaxAgeFilter final : public LegacyChannelIdleFilter { static const grpc_channel_filter kFilter; struct Config; + static absl::string_view TypeName() { return "max_age"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 6190ad4008..6576c6df96 100644 --- a/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -27,6 +27,7 @@ #include #include +#include "absl/log/log.h" #include "absl/meta/type_traits.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -36,7 +37,6 @@ #include "absl/types/optional.h" #include -#include #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" @@ -150,10 +150,9 @@ FaultInjectionFilter::FaultInjectionFilter(ChannelFilter::Args filter_args) ArenaPromise FaultInjectionFilter::Call::OnClientInitialMetadata( ClientMetadata& md, FaultInjectionFilter* filter) { auto decision = filter->MakeInjectionDecision(md); - if (GRPC_TRACE_FLAG_ENABLED(fault_injection_filter)) { - gpr_log(GPR_INFO, "chand=%p: Fault injection triggered %s", this, - decision.ToString().c_str()); - } + GRPC_TRACE_LOG(fault_injection_filter, INFO) + << "chand=" << this << ": Fault injection triggered " + << decision.ToString(); auto delay = decision.DelayUntil(); return TrySeq(Sleep(delay), [decision = std::move(decision)]() { return decision.MaybeAbort(); @@ -270,8 +269,7 @@ std::string FaultInjectionFilter::InjectionDecision::ToString() const { } const grpc_channel_filter FaultInjectionFilter::kFilter = - MakePromiseBasedFilter( - "fault_injection_filter"); + MakePromiseBasedFilter(); void FaultInjectionFilterRegister(CoreConfiguration::Builder* builder) { FaultInjectionServiceConfigParser::Register(builder); diff --git a/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h b/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h index 515df16a85..7bcd222706 100644 --- a/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/deps/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -45,6 +45,8 @@ class FaultInjectionFilter public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "fault_injection_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc new file mode 100644 index 0000000000..c3a6ab3e71 --- /dev/null +++ b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc @@ -0,0 +1,167 @@ +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h" + +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" + +#include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/promise/context.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/resolver/xds/xds_resolver_attributes.h" +#include "src/core/service_config/service_config.h" +#include "src/core/service_config/service_config_call_data.h" + +namespace grpc_core { + +const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerMessage; +const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerHalfClose; +const NoInterceptor GcpAuthenticationFilter::Call::OnServerInitialMetadata; +const NoInterceptor GcpAuthenticationFilter::Call::OnServerToClientMessage; +const NoInterceptor GcpAuthenticationFilter::Call::OnServerTrailingMetadata; +const NoInterceptor GcpAuthenticationFilter::Call::OnFinalize; + +absl::Status GcpAuthenticationFilter::Call::OnClientInitialMetadata( + ClientMetadata& /*md*/, GcpAuthenticationFilter* filter) { + // Get the cluster name chosen for this RPC. + auto* service_config_call_data = GetContext(); + auto cluster_attribute = + service_config_call_data->GetCallAttribute(); + if (cluster_attribute == nullptr) { + // Can't happen, but be defensive. + return absl::InternalError( + "GCP authentication filter: call has no xDS cluster attribute"); + } + absl::string_view cluster_name = cluster_attribute->cluster(); + if (!absl::ConsumePrefix(&cluster_name, "cluster:")) { + return absl::OkStatus(); // Cluster specifier plugin. + } + // Look up the CDS resource for the cluster. + auto it = filter->xds_config_->clusters.find(cluster_name); + if (it == filter->xds_config_->clusters.end()) { + // Can't happen, but be defensive. + return absl::InternalError( + absl::StrCat("GCP authentication filter: xDS cluster ", cluster_name, + " not found in XdsConfig")); + } + if (!it->second.ok()) { + // Cluster resource had an error, so fail the call. + // Note: For wait_for_ready calls, this does the wrong thing by + // failing the call instead of queuing it, but there's no easy + // way to queue the call here until we get a valid CDS resource, + // because once that happens, a new instance of this filter will be + // swapped in for subsequent calls, but *this* call is already tied + // to this filter instance, which will never see the update. + return absl::UnavailableError( + absl::StrCat("GCP authentication filter: CDS resource unavailable for ", + cluster_name)); + } + if (it->second->cluster == nullptr) { + // Can't happen, but be defensive. + return absl::InternalError(absl::StrCat( + "GCP authentication filter: CDS resource not present for cluster ", + cluster_name)); + } + auto& metadata_map = it->second->cluster->metadata; + const XdsMetadataValue* metadata_value = + metadata_map.Find(filter->filter_config_->filter_instance_name); + // If no audience in the cluster, then no need to add call creds. + if (metadata_value == nullptr) return absl::OkStatus(); + // If the entry is present but the wrong type, fail the RPC. + if (metadata_value->type() != XdsGcpAuthnAudienceMetadataValue::Type()) { + return absl::UnavailableError(absl::StrCat( + "GCP authentication filter: audience metadata in wrong format for " + "cluster ", + cluster_name)); + } + // Get the call creds instance. + auto creds = filter->GetCallCredentials( + DownCast(metadata_value)->url()); + // Add the call creds instance to the call. + auto* arena = GetContext(); + auto* security_ctx = DownCast( + arena->GetContext()); + if (security_ctx == nullptr) { + security_ctx = arena->New(std::move(creds)); + arena->SetContext(security_ctx); + } else { + security_ctx->creds = std::move(creds); + } + return absl::OkStatus(); +} + +const grpc_channel_filter GcpAuthenticationFilter::kFilter = + MakePromiseBasedFilter(); + +absl::StatusOr> +GcpAuthenticationFilter::Create(const ChannelArgs& args, + ChannelFilter::Args filter_args) { + auto* service_config = args.GetObject(); + if (service_config == nullptr) { + return absl::InvalidArgumentError( + "gcp_auth: no service config in channel args"); + } + auto* config = static_cast( + service_config->GetGlobalParsedConfig( + GcpAuthenticationServiceConfigParser::ParserIndex())); + if (config == nullptr) { + return absl::InvalidArgumentError("gcp_auth: parsed config not found"); + } + auto* filter_config = config->GetConfig(filter_args.instance_id()); + if (filter_config == nullptr) { + return absl::InvalidArgumentError( + "gcp_auth: filter instance ID not found in filter config"); + } + auto xds_config = args.GetObjectRef(); + if (xds_config == nullptr) { + return absl::InvalidArgumentError( + "gcp_auth: xds config not found in channel args"); + } + return std::make_unique(filter_config, + std::move(xds_config)); +} + +GcpAuthenticationFilter::GcpAuthenticationFilter( + const GcpAuthenticationParsedConfig::Config* filter_config, + RefCountedPtr xds_config) + : filter_config_(filter_config), + xds_config_(std::move(xds_config)), + cache_(filter_config->cache_size) {} + +RefCountedPtr +GcpAuthenticationFilter::GetCallCredentials(const std::string& audience) { + MutexLock lock(&mu_); + return cache_.GetOrInsert(audience, [](const std::string& audience) { + return MakeRefCounted(audience); + }); +} + +void GcpAuthenticationFilterRegister(CoreConfiguration::Builder* builder) { + GcpAuthenticationServiceConfigParser::Register(builder); +} + +} // namespace grpc_core diff --git a/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h new file mode 100644 index 0000000000..927e2de05e --- /dev/null +++ b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -0,0 +1,82 @@ +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#ifndef GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_FILTER_H +#define GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_FILTER_H + +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" + +#include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/resolver/xds/xds_config.h" +#include "src/core/util/lru_cache.h" + +namespace grpc_core { + +// xDS GCP Authentication filter. +// https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/gcp_authn_filter +class GcpAuthenticationFilter + : public ImplementChannelFilter { + public: + static const grpc_channel_filter kFilter; + + static absl::string_view TypeName() { return "gcp_authentication_filter"; } + + static absl::StatusOr> Create( + const ChannelArgs& args, ChannelFilter::Args filter_args); + + GcpAuthenticationFilter( + const GcpAuthenticationParsedConfig::Config* filter_config, + RefCountedPtr xds_config); + + class Call { + public: + absl::Status OnClientInitialMetadata(ClientMetadata& /*md*/, + GcpAuthenticationFilter* filter); + static const NoInterceptor OnClientToServerMessage; + static const NoInterceptor OnClientToServerHalfClose; + static const NoInterceptor OnServerInitialMetadata; + static const NoInterceptor OnServerToClientMessage; + static const NoInterceptor OnServerTrailingMetadata; + static const NoInterceptor OnFinalize; + }; + + private: + RefCountedPtr GetCallCredentials( + const std::string& audience); + + const GcpAuthenticationParsedConfig::Config* filter_config_; + const RefCountedPtr xds_config_; + + Mutex mu_; + LruCache> + cache_ ABSL_GUARDED_BY(&mu_); +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_FILTER_H diff --git a/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc new file mode 100644 index 0000000000..4af33e528f --- /dev/null +++ b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc @@ -0,0 +1,81 @@ +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#include + +#include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" + +#include + +#include "absl/types/optional.h" + +#include "src/core/lib/channel/channel_args.h" + +namespace grpc_core { + +const JsonLoaderInterface* GcpAuthenticationParsedConfig::Config::JsonLoader( + const JsonArgs&) { + static const auto* loader = + JsonObjectLoader() + .Field("filter_instance_name", &Config::filter_instance_name) + .OptionalField("cache_size", &Config::cache_size) + .Finish(); + return loader; +} + +void GcpAuthenticationParsedConfig::Config::JsonPostLoad( + const Json&, const JsonArgs&, ValidationErrors* errors) { + if (cache_size == 0) { + ValidationErrors::ScopedField field(errors, ".cache_size"); + errors->AddError("must be non-zero"); + } +} + +const JsonLoaderInterface* GcpAuthenticationParsedConfig::JsonLoader( + const JsonArgs&) { + static const auto* loader = + JsonObjectLoader() + .OptionalField("gcp_authentication", + &GcpAuthenticationParsedConfig::configs_) + .Finish(); + return loader; +} + +std::unique_ptr +GcpAuthenticationServiceConfigParser::ParseGlobalParams( + const ChannelArgs& args, const Json& json, ValidationErrors* errors) { + // Only parse config if the following channel arg is enabled. + if (!args.GetBool(GRPC_ARG_PARSE_GCP_AUTHENTICATION_METHOD_CONFIG) + .value_or(false)) { + return nullptr; + } + // Parse config from json. + return LoadFromJson>( + json, JsonArgs(), errors); +} + +void GcpAuthenticationServiceConfigParser::Register( + CoreConfiguration::Builder* builder) { + builder->service_config_parser()->RegisterParser( + std::make_unique()); +} + +size_t GcpAuthenticationServiceConfigParser::ParserIndex() { + return CoreConfiguration::Get().service_config_parser().GetParserIndex( + parser_name()); +} + +} // namespace grpc_core diff --git a/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h new file mode 100644 index 0000000000..97df008e96 --- /dev/null +++ b/deps/grpc/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h @@ -0,0 +1,87 @@ +// +// Copyright 2024 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#ifndef GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_SERVICE_CONFIG_PARSER_H +#define GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_SERVICE_CONFIG_PARSER_H + +#include + +#include +#include +#include + +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/service_config/service_config_parser.h" +#include "src/core/util/json/json.h" +#include "src/core/util/json/json_args.h" +#include "src/core/util/json/json_object_loader.h" + +// Channel arg key for enabling parsing fault injection via method config. +#define GRPC_ARG_PARSE_GCP_AUTHENTICATION_METHOD_CONFIG \ + "grpc.internal.parse_gcp_authentication_method_config" + +namespace grpc_core { + +class GcpAuthenticationParsedConfig : public ServiceConfigParser::ParsedConfig { + public: + struct Config { + std::string filter_instance_name; + uint64_t cache_size = 10; + + static const JsonLoaderInterface* JsonLoader(const JsonArgs&); + void JsonPostLoad(const Json&, const JsonArgs&, ValidationErrors* errors); + }; + + // Returns the config at the specified index. There might be multiple + // GCP auth filters in the list of HTTP filters at the same time. + // The order of the list is stable, and an index is used to keep track of + // their relative positions. Each filter instance uses this method to + // access the appropriate parsed config for that instance. + const Config* GetConfig(size_t index) const { + if (index >= configs_.size()) return nullptr; + return &configs_[index]; + } + + static const JsonLoaderInterface* JsonLoader(const JsonArgs&); + + private: + std::vector configs_; +}; + +class GcpAuthenticationServiceConfigParser final + : public ServiceConfigParser::Parser { + public: + absl::string_view name() const override { return parser_name(); } + std::unique_ptr ParseGlobalParams( + const ChannelArgs& args, const Json& json, + ValidationErrors* errors) override; + // Returns the parser index for the parser. + static size_t ParserIndex(); + // Registers the parser. + static void Register(CoreConfiguration::Builder* builder); + + private: + static absl::string_view parser_name() { return "gcp_auth"; } +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_EXT_FILTERS_GCP_AUTHENTICATION_GCP_AUTHENTICATION_SERVICE_CONFIG_PARSER_H diff --git a/deps/grpc/src/core/ext/filters/http/client/http_client_filter.cc b/deps/grpc/src/core/ext/filters/http/client/http_client_filter.cc index 6af2b959be..7fd04a371e 100644 --- a/deps/grpc/src/core/ext/filters/http/client/http_client_filter.cc +++ b/deps/grpc/src/core/ext/filters/http/client/http_client_filter.cc @@ -59,7 +59,7 @@ const NoInterceptor HttpClientFilter::Call::OnFinalize; const grpc_channel_filter HttpClientFilter::kFilter = MakePromiseBasedFilter("http-client"); + kFilterExaminesServerInitialMetadata>(); namespace { absl::Status CheckServerMetadata(ServerMetadata* b) { diff --git a/deps/grpc/src/core/ext/filters/http/client/http_client_filter.h b/deps/grpc/src/core/ext/filters/http/client/http_client_filter.h index f985337f2c..0b319cec30 100644 --- a/deps/grpc/src/core/ext/filters/http/client/http_client_filter.h +++ b/deps/grpc/src/core/ext/filters/http/client/http_client_filter.h @@ -35,6 +35,8 @@ class HttpClientFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "http-client"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/http/client_authority_filter.cc b/deps/grpc/src/core/ext/filters/http/client_authority_filter.cc index b6970d9ecb..6dd4423415 100644 --- a/deps/grpc/src/core/ext/filters/http/client_authority_filter.cc +++ b/deps/grpc/src/core/ext/filters/http/client_authority_filter.cc @@ -66,8 +66,7 @@ void ClientAuthorityFilter::Call::OnClientInitialMetadata( } const grpc_channel_filter ClientAuthorityFilter::kFilter = - MakePromiseBasedFilter( - "authority"); + MakePromiseBasedFilter(); namespace { bool NeedsClientAuthorityFilter(const ChannelArgs& args) { diff --git a/deps/grpc/src/core/ext/filters/http/client_authority_filter.h b/deps/grpc/src/core/ext/filters/http/client_authority_filter.h index da154fbac5..c3b817527c 100644 --- a/deps/grpc/src/core/ext/filters/http/client_authority_filter.h +++ b/deps/grpc/src/core/ext/filters/http/client_authority_filter.h @@ -39,6 +39,8 @@ class ClientAuthorityFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "authority"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args); diff --git a/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.cc b/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.cc index e3d0a61cd0..dead10bbe1 100644 --- a/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" @@ -66,12 +65,12 @@ const grpc_channel_filter ClientCompressionFilter::kFilter = MakePromiseBasedFilter("compression"); + kFilterExaminesOutboundMessages>(); const grpc_channel_filter ServerCompressionFilter::kFilter = MakePromiseBasedFilter("compression"); + kFilterExaminesOutboundMessages>(); absl::StatusOr> ClientCompressionFilter::Create(const ChannelArgs& args, ChannelFilter::Args) { @@ -104,19 +103,17 @@ ChannelCompression::ChannelCompression(const ChannelArgs& args) &name)) { name = ""; } - gpr_log(GPR_ERROR, - "default compression algorithm %s not enabled: switching to none", - name); + LOG(ERROR) << "default compression algorithm " << name + << " not enabled: switching to none"; default_compression_algorithm_ = GRPC_COMPRESS_NONE; } } MessageHandle ChannelCompression::CompressMessage( MessageHandle message, grpc_compression_algorithm algorithm) const { - if (GRPC_TRACE_FLAG_ENABLED(compression)) { - gpr_log(GPR_INFO, "CompressMessage: len=%" PRIdPTR " alg=%d flags=%d", - message->payload()->Length(), algorithm, message->flags()); - } + GRPC_TRACE_LOG(compression, INFO) + << "CompressMessage: len=" << message->payload()->Length() + << " alg=" << algorithm << " flags=" << message->flags(); auto* call_tracer = MaybeGetContext(); if (call_tracer != nullptr) { call_tracer->RecordSendMessage(*message->payload()); @@ -144,10 +141,10 @@ MessageHandle ChannelCompression::CompressMessage( const float savings_ratio = 1.0f - static_cast(after_size) / static_cast(before_size); CHECK(grpc_compression_algorithm_name(algorithm, &algo_name)); - gpr_log(GPR_INFO, - "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR - " bytes (%.2f%% savings)", - algo_name, before_size, after_size, 100 * savings_ratio); + LOG(INFO) << absl::StrFormat( + "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR + " bytes (%.2f%% savings)", + algo_name, before_size, after_size, 100 * savings_ratio); } tmp.Swap(payload); flags |= GRPC_WRITE_INTERNAL_COMPRESS; @@ -158,10 +155,9 @@ MessageHandle ChannelCompression::CompressMessage( if (GRPC_TRACE_FLAG_ENABLED(compression)) { const char* algo_name; CHECK(grpc_compression_algorithm_name(algorithm, &algo_name)); - gpr_log(GPR_INFO, - "Algorithm '%s' enabled but decided not to compress. Input size: " - "%" PRIuPTR, - algo_name, payload->Length()); + LOG(INFO) << "Algorithm '" << algo_name + << "' enabled but decided not to compress. Input size: " + << payload->Length(); } } return message; @@ -169,11 +165,10 @@ MessageHandle ChannelCompression::CompressMessage( absl::StatusOr ChannelCompression::DecompressMessage( bool is_client, MessageHandle message, DecompressArgs args) const { - if (GRPC_TRACE_FLAG_ENABLED(compression)) { - gpr_log(GPR_INFO, "DecompressMessage: len=%" PRIdPTR " max=%d alg=%d", - message->payload()->Length(), - args.max_recv_message_length.value_or(-1), args.algorithm); - } + GRPC_TRACE_LOG(compression, INFO) + << "DecompressMessage: len=" << message->payload()->Length() + << " max=" << args.max_recv_message_length.value_or(-1) + << " alg=" << args.algorithm; auto* call_tracer = MaybeGetContext(); if (call_tracer != nullptr) { call_tracer->RecordReceivedMessage(*message->payload()); diff --git a/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.h b/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.h index 5d82846d01..ae3a9ee317 100644 --- a/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.h +++ b/deps/grpc/src/core/ext/filters/http/message_compress/compression_filter.h @@ -25,6 +25,7 @@ #include #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "absl/types/optional.h" #include @@ -110,6 +111,8 @@ class ClientCompressionFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "compression"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -147,6 +150,8 @@ class ServerCompressionFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "compression"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc b/deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc index 8d4b71d510..fa6a38ddcc 100644 --- a/deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc +++ b/deps/grpc/src/core/ext/filters/http/server/http_server_filter.cc @@ -25,12 +25,12 @@ #include #include "absl/base/attributes.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" @@ -55,7 +55,7 @@ const NoInterceptor HttpServerFilter::Call::OnFinalize; const grpc_channel_filter HttpServerFilter::kFilter = MakePromiseBasedFilter("http-server"); + kFilterExaminesServerInitialMetadata>(); namespace { void FilterOutgoingMetadata(ServerMetadata* md) { @@ -139,10 +139,8 @@ ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata( } void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { - if (GRPC_TRACE_FLAG_ENABLED(call)) { - gpr_log(GPR_INFO, "%s[http-server] Write metadata", - GetContext()->DebugTag().c_str()); - } + GRPC_TRACE_LOG(call, INFO) + << GetContext()->DebugTag() << "[http-server] Write metadata"; FilterOutgoingMetadata(&md); md.Set(HttpStatusMetadata(), 200); md.Set(ContentTypeMetadata(), ContentTypeMetadata::kApplicationGrpc); diff --git a/deps/grpc/src/core/ext/filters/http/server/http_server_filter.h b/deps/grpc/src/core/ext/filters/http/server/http_server_filter.h index a1f330e58b..8f933865d7 100644 --- a/deps/grpc/src/core/ext/filters/http/server/http_server_filter.h +++ b/deps/grpc/src/core/ext/filters/http/server/http_server_filter.h @@ -36,6 +36,8 @@ class HttpServerFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "http-server"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 100584f5ba..2023fb436d 100644 --- a/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -29,6 +29,7 @@ #include #include "absl/container/inlined_vector.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" @@ -41,7 +42,6 @@ #include #include #include -#include #include #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" @@ -103,26 +103,23 @@ std::string GetCensusSafeClientIpString( // Find the client URI string. const Slice* client_uri_slice = initial_metadata.get_pointer(PeerString()); if (client_uri_slice == nullptr) { - gpr_log(GPR_ERROR, - "Unable to extract client URI string (peer string) from gRPC " - "metadata."); + LOG(ERROR) << "Unable to extract client URI string (peer string) from gRPC " + "metadata."; return ""; } absl::StatusOr client_uri = URI::Parse(client_uri_slice->as_string_view()); if (!client_uri.ok()) { - gpr_log(GPR_ERROR, - "Unable to parse the client URI string (peer string) to a client " - "URI. Error: %s", - client_uri.status().ToString().c_str()); + LOG(ERROR) << "Unable to parse the client URI string (peer string) to a " + "client URI. Error: " + << client_uri.status(); return ""; } // Parse the client URI into grpc_resolved_address. grpc_resolved_address resolved_address; bool success = grpc_parse_uri(*client_uri, &resolved_address); if (!success) { - gpr_log(GPR_ERROR, - "Unable to parse client URI into a grpc_resolved_address."); + LOG(ERROR) << "Unable to parse client URI into a grpc_resolved_address."; return ""; } // Convert the socket address in the grpc_resolved_address into a hex string @@ -247,8 +244,8 @@ void ServerLoadReportingFilter::Call::OnFinalize( } const grpc_channel_filter ServerLoadReportingFilter::kFilter = - MakePromiseBasedFilter( - "server_load_reporting"); + MakePromiseBasedFilter(); // TODO(juanlishen): We should register the filter during grpc initialization // time once OpenCensus is compatible with our build system. For now, we force diff --git a/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h index 76684093a0..41f66ec948 100644 --- a/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h +++ b/deps/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h @@ -39,6 +39,8 @@ class ServerLoadReportingFilter public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "server_load_reporting"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args); diff --git a/deps/grpc/src/core/ext/filters/logging/logging_filter.cc b/deps/grpc/src/core/ext/filters/logging/logging_filter.cc index 3d95d91458..67d1b27469 100644 --- a/deps/grpc/src/core/ext/filters/logging/logging_filter.cc +++ b/deps/grpc/src/core/ext/filters/logging/logging_filter.cc @@ -46,7 +46,6 @@ #include #include #include -#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/filters/logging/logging_sink.h" @@ -106,11 +105,9 @@ class MetadataEncoder { } uint64_t mdentry_len = key.length() + value.length(); if (mdentry_len > log_len_) { - gpr_log( - GPR_DEBUG, - "Skipped metadata key because of max metadata logging bytes %" PRIu64 - " (current) vs %" PRIu64 " (max less already accounted metadata)", - mdentry_len, log_len_); + VLOG(2) << "Skipped metadata key because of max metadata logging bytes " + << mdentry_len << " (current) vs " << log_len_ + << " (max less already accounted metadata)"; truncated_ = true; return; } @@ -417,7 +414,7 @@ const grpc_channel_filter ClientLoggingFilter::kFilter = MakePromiseBasedFilter("logging"); + kFilterExaminesOutboundMessages>(); absl::StatusOr> ServerLoggingFilter::Create(const ChannelArgs& /*args*/, @@ -483,7 +480,7 @@ const grpc_channel_filter ServerLoggingFilter::kFilter = MakePromiseBasedFilter("logging"); + kFilterExaminesOutboundMessages>(); void RegisterLoggingFilter(LoggingSink* sink) { g_logging_sink = sink; diff --git a/deps/grpc/src/core/ext/filters/logging/logging_filter.h b/deps/grpc/src/core/ext/filters/logging/logging_filter.h index 30c28a5b57..5d8b77752c 100644 --- a/deps/grpc/src/core/ext/filters/logging/logging_filter.h +++ b/deps/grpc/src/core/ext/filters/logging/logging_filter.h @@ -78,6 +78,8 @@ class ClientLoggingFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "logging"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args /*filter_args*/); @@ -108,6 +110,8 @@ class ServerLoggingFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "logging"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args /*filter_args*/); diff --git a/deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc b/deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc index 3a8a3659a4..db0b4d514e 100644 --- a/deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc +++ b/deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc @@ -23,11 +23,11 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" @@ -137,12 +137,12 @@ size_t MessageSizeParser::ParserIndex() { const grpc_channel_filter ClientMessageSizeFilter::kFilter = MakePromiseBasedFilter("message_size"); + kFilterExaminesInboundMessages>(); const grpc_channel_filter ServerMessageSizeFilter::kFilter = MakePromiseBasedFilter("message_size"); + kFilterExaminesInboundMessages>(); absl::StatusOr> ClientMessageSizeFilter::Create(const ChannelArgs& args, ChannelFilter::Args) { @@ -159,20 +159,17 @@ ServerMetadataHandle CheckPayload(const Message& msg, absl::optional max_length, bool is_client, bool is_send) { if (!max_length.has_value()) return nullptr; - if (GRPC_TRACE_FLAG_ENABLED(call)) { - gpr_log(GPR_INFO, "%s[message_size] %s len:%" PRIdPTR " max:%d", - GetContext()->DebugTag().c_str(), - is_send ? "send" : "recv", msg.payload()->Length(), *max_length); - } + GRPC_TRACE_LOG(call, INFO) + << GetContext()->DebugTag() << "[message_size] " + << (is_send ? "send" : "recv") << " len:" << msg.payload()->Length() + << " max:" << *max_length; if (msg.payload()->Length() <= *max_length) return nullptr; - auto r = Arena::MakePooled(); - r->Set(GrpcStatusMetadata(), GRPC_STATUS_RESOURCE_EXHAUSTED); - r->Set(GrpcMessageMetadata(), - Slice::FromCopiedString(absl::StrFormat( - "%s: %s message larger than max (%u vs. %d)", - is_client ? "CLIENT" : "SERVER", is_send ? "Sent" : "Received", - msg.payload()->Length(), *max_length))); - return r; + return ServerMetadataFromStatus( + GRPC_STATUS_RESOURCE_EXHAUSTED, + absl::StrFormat("%s: %s message larger than max (%u vs. %d)", + is_client ? "CLIENT" : "SERVER", + is_send ? "Sent" : "Received", msg.payload()->Length(), + *max_length)); } } // namespace @@ -191,12 +188,12 @@ ClientMessageSizeFilter::Call::Call(ClientMessageSizeFilter* filter) if (config_from_call_context->max_send_size().has_value() && (!max_send_size.has_value() || *config_from_call_context->max_send_size() < *max_send_size)) { - max_send_size = *config_from_call_context->max_send_size(); + max_send_size = config_from_call_context->max_send_size(); } if (config_from_call_context->max_recv_size().has_value() && (!max_recv_size.has_value() || *config_from_call_context->max_recv_size() < *max_recv_size)) { - max_recv_size = *config_from_call_context->max_recv_size(); + max_recv_size = config_from_call_context->max_recv_size(); } limits_ = MessageSizeParsedConfig(max_send_size, max_recv_size); } diff --git a/deps/grpc/src/core/ext/filters/message_size/message_size_filter.h b/deps/grpc/src/core/ext/filters/message_size/message_size_filter.h index 970604fe35..3ed3b2b735 100644 --- a/deps/grpc/src/core/ext/filters/message_size/message_size_filter.h +++ b/deps/grpc/src/core/ext/filters/message_size/message_size_filter.h @@ -89,6 +89,8 @@ class ServerMessageSizeFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "message_size"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -117,6 +119,8 @@ class ClientMessageSizeFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "message_size"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/rbac/rbac_filter.cc b/deps/grpc/src/core/ext/filters/rbac/rbac_filter.cc index a86636b10a..583042786f 100644 --- a/deps/grpc/src/core/ext/filters/rbac/rbac_filter.cc +++ b/deps/grpc/src/core/ext/filters/rbac/rbac_filter.cc @@ -71,7 +71,7 @@ absl::Status RbacFilter::Call::OnClientInitialMetadata(ClientMetadata& md, } const grpc_channel_filter RbacFilter::kFilterVtable = - MakePromiseBasedFilter("rbac_filter"); + MakePromiseBasedFilter(); RbacFilter::RbacFilter(size_t index, EvaluateArgs::PerChannelArgs per_channel_evaluate_args) diff --git a/deps/grpc/src/core/ext/filters/rbac/rbac_filter.h b/deps/grpc/src/core/ext/filters/rbac/rbac_filter.h index d033b799d5..f41e8490cc 100644 --- a/deps/grpc/src/core/ext/filters/rbac/rbac_filter.h +++ b/deps/grpc/src/core/ext/filters/rbac/rbac_filter.h @@ -42,6 +42,8 @@ class RbacFilter : public ImplementChannelFilter { // and enforces the RBAC policy. static const grpc_channel_filter kFilterVtable; + static absl::string_view TypeName() { return "rbac_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 246605a490..cf83e5db1f 100644 --- a/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -37,8 +37,6 @@ #include "absl/strings/strip.h" #include "absl/types/optional.h" -#include - #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" @@ -69,8 +67,7 @@ UniqueTypeName XdsOverrideHostAttribute::TypeName() { const grpc_channel_filter StatefulSessionFilter::kFilter = MakePromiseBasedFilter( - "stateful_session_filter"); + kFilterExaminesServerInitialMetadata>(); absl::StatusOr> StatefulSessionFilter::Create(const ChannelArgs&, diff --git a/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.h b/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.h index 64c488bce3..3bffbaa854 100644 --- a/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/deps/grpc/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -74,6 +74,8 @@ class StatefulSessionFilter public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "stateful_session_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/deps/grpc/src/core/ext/transport/binder/client/binder_connector.cc b/deps/grpc/src/core/ext/transport/binder/client/binder_connector.cc index 2dcb0e0374..725c5ad8a3 100644 --- a/deps/grpc/src/core/ext/transport/binder/client/binder_connector.cc +++ b/deps/grpc/src/core/ext/transport/binder/client/binder_connector.cc @@ -34,6 +34,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include @@ -71,8 +72,7 @@ class BinderConnector : public grpc_core::SubchannelConnector { #else CHECK(0); #endif - gpr_log(GPR_INFO, "BinderConnector %p conn_id_ = %s", this, - conn_id_.c_str()); + LOG(INFO) << "BinderConnector " << this << " conn_id_ = " << conn_id_; args_ = args; CHECK_EQ(notify_, nullptr); @@ -124,7 +124,7 @@ namespace grpc_core { RefCountedPtr BinderClientChannelFactory::CreateSubchannel( const grpc_resolved_address& address, const ChannelArgs& args) { - gpr_log(GPR_INFO, "BinderClientChannelFactory creating subchannel %p", this); + LOG(INFO) << "BinderClientChannelFactory creating subchannel " << this; return Subchannel::Create( MakeOrphanable(), address, args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "binder.authority")); diff --git a/deps/grpc/src/core/ext/transport/binder/client/channel_create.cc b/deps/grpc/src/core/ext/transport/binder/client/channel_create.cc index 9f757f69bc..f5dd12c999 100644 --- a/deps/grpc/src/core/ext/transport/binder/client/channel_create.cc +++ b/deps/grpc/src/core/ext/transport/binder/client/channel_create.cc @@ -28,7 +28,6 @@ #include #include -#include #include "src/core/lib/gprpp/crash.h" @@ -161,10 +160,10 @@ namespace experimental { std::shared_ptr CreateBinderChannel( void*, jobject, absl::string_view, absl::string_view, std::shared_ptr) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } @@ -173,10 +172,10 @@ std::shared_ptr CreateCustomBinderChannel( void*, jobject, absl::string_view, absl::string_view, std::shared_ptr, const ChannelArguments&) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } @@ -184,10 +183,10 @@ std::shared_ptr CreateCustomBinderChannel( std::shared_ptr CreateBinderChannel( void*, jobject, absl::string_view, std::shared_ptr) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } @@ -196,29 +195,29 @@ std::shared_ptr CreateCustomBinderChannel( void*, jobject, absl::string_view, std::shared_ptr, const ChannelArguments&) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } bool InitializeBinderChannelJavaClass(void* jni_env_void) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } bool InitializeBinderChannelJavaClass( void* jni_env_void, std::function class_finder) { - gpr_log(GPR_ERROR, - "This APK is compiled with Android API level = %d, which is not " - "supported. See port_platform.h for supported versions.", - __ANDROID_API__); + LOG(ERROR) << "This APK is compiled with Android API level = " + << __ANDROID_API__ + << ", which is not supported. See port_platform.h for supported " + "versions."; CHECK(0); return {}; } diff --git a/deps/grpc/src/core/ext/transport/binder/client/channel_create_impl.cc b/deps/grpc/src/core/ext/transport/binder/client/channel_create_impl.cc index 197361104b..cf3a0caab6 100644 --- a/deps/grpc/src/core/ext/transport/binder/client/channel_create_impl.cc +++ b/deps/grpc/src/core/ext/transport/binder/client/channel_create_impl.cc @@ -28,7 +28,6 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" diff --git a/deps/grpc/src/core/ext/transport/binder/client/jni_utils.cc b/deps/grpc/src/core/ext/transport/binder/client/jni_utils.cc index 1133604a17..04190d01a3 100644 --- a/deps/grpc/src/core/ext/transport/binder/client/jni_utils.cc +++ b/deps/grpc/src/core/ext/transport/binder/client/jni_utils.cc @@ -15,14 +15,12 @@ #include "src/core/ext/transport/binder/client/jni_utils.h" #include "absl/log/check.h" -#include "absl/log/log.h" // IWYU pragma: keep +#include "absl/log/log.h" #include #ifndef GRPC_NO_BINDER -#include - #include "src/core/lib/gprpp/crash.h" #if defined(ANDROID) || defined(__ANDROID__) @@ -56,13 +54,13 @@ jclass FindNativeConnectionHelper( // from JNI_OnLoad // * The APK does not correctly depends on the helper class, or the // class get shrinked - gpr_log(GPR_ERROR, - "Cannot find binder transport Java helper class. Did you invoke " - "grpc::experimental::InitializeBinderChannelJavaClass correctly " - "beforehand? Did the APK correctly include the connection helper " - "class (i.e depends on build target " - "src/core/ext/transport/binder/java/io/grpc/binder/" - "cpp:connection_helper) ?"); + LOG(ERROR) + << "Cannot find binder transport Java helper class. Did you invoke " + "grpc::experimental::InitializeBinderChannelJavaClass correctly " + "beforehand? Did the APK correctly include the connection helper " + "class (i.e depends on build target " + "src/core/ext/transport/binder/java/io/grpc/binder/" + "cpp:connection_helper) ?"; // TODO(mingcl): Maybe it is worth to try again so the failure can be fixed // by invoking this function again at a different thread. return nullptr; diff --git a/deps/grpc/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/deps/grpc/src/core/ext/transport/binder/security_policy/binder_security_policy.cc index bd05a03811..0730476733 100644 --- a/deps/grpc/src/core/ext/transport/binder/security_policy/binder_security_policy.cc +++ b/deps/grpc/src/core/ext/transport/binder/security_policy/binder_security_policy.cc @@ -24,8 +24,7 @@ #include #include "absl/log/check.h" - -#include +#include "absl/log/log.h" #include "src/core/ext/transport/binder/client/jni_utils.h" #include "src/core/lib/gprpp/crash.h" @@ -91,11 +90,11 @@ bool SameSignatureSecurityPolicy::IsAuthorized(int uid) { JNIEnv* env = GetEnv(jvm_); bool result = grpc_binder::IsSignatureMatch(env, context_, getuid(), uid); if (result) { - gpr_log(GPR_INFO, "uid %d and uid %d passed SameSignature check", getuid(), - uid); + LOG(INFO) << "uid " << getuid() << " and uid " << uid + << " passed SameSignature check"; } else { - gpr_log(GPR_ERROR, "uid %d and uid %d failed SameSignature check", getuid(), - uid); + LOG(ERROR) << "uid " << getuid() << " and uid " << uid + << " failed SameSignature check"; } return result; } diff --git a/deps/grpc/src/core/ext/transport/binder/server/binder_server.cc b/deps/grpc/src/core/ext/transport/binder/server/binder_server.cc index 6f4d932f43..3d84b95a8d 100644 --- a/deps/grpc/src/core/ext/transport/binder/server/binder_server.cc +++ b/deps/grpc/src/core/ext/transport/binder/server/binder_server.cc @@ -23,6 +23,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include @@ -54,8 +55,8 @@ Java_io_grpc_binder_cpp_GrpcCppServerBuilder_GetEndpointBinderInternal__Ljava_la ai_binder = static_cast( grpc_get_endpoint_binder(std::string(conn_id))); if (ai_binder == nullptr) { - gpr_log(GPR_ERROR, "Cannot find endpoint binder with connection id = %s", - conn_id); + LOG(ERROR) << "Cannot find endpoint binder with connection id = " + << conn_id; } if (isCopy == JNI_TRUE) { jni_env->ReleaseStringUTFChars(conn_id_jstring, conn_id); @@ -180,7 +181,7 @@ class BinderServerListener : public Server::ListenerInterface { return absl::InvalidArgumentError("Not a SETUP_TRANSPORT request"); } - gpr_log(GPR_INFO, "BinderServerListener calling uid = %d", uid); + LOG(INFO) << "BinderServerListener calling uid = " << uid; if (!security_policy_->IsAuthorized(uid)) { // TODO(mingcl): For now we just ignore this unauthorized // SETUP_TRANSPORT transaction and ghost the client. Check if we should @@ -196,7 +197,7 @@ class BinderServerListener : public Server::ListenerInterface { if (!status.ok()) { return status; } - gpr_log(GPR_INFO, "BinderTransport client protocol version = %d", version); + LOG(INFO) << "BinderTransport client protocol version = " << version; // TODO(mingcl): Make sure we only give client a version that is not newer // than the version they specify. For now, we always tell client that we // only support version=1. diff --git a/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.cc b/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.cc index 691ac50d6e..5014ff85cc 100644 --- a/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.cc @@ -29,8 +29,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/substitute.h" -#include - #include "src/core/ext/transport/binder/transport/binder_stream.h" #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h" @@ -108,8 +106,8 @@ void grpc_binder_transport::InitStream(grpc_stream* gs, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena) { - gpr_log(GPR_INFO, "%s = %p %p %p %p %p", __func__, this, gs, refcount, - server_data, arena); + LOG(INFO) << __func__ << " = " << this << " " << gs << " " << refcount << " " + << server_data << " " << arena; // Note that this function is not locked and may be invoked concurrently new (gs) grpc_binder_stream(this, refcount, server_data, arena, NewStreamTxCode(), is_client); @@ -132,9 +130,8 @@ static void AssignMetadata(grpc_metadata_batch* mb, for (auto& p : md) { mb->Append(p.first, grpc_core::Slice::FromCopiedString(p.second), [&](absl::string_view error, const grpc_core::Slice&) { - gpr_log( - GPR_DEBUG, "Failed to parse metadata: %s", - absl::StrCat("key=", p.first, " error=", error).c_str()); + VLOG(2) << "Failed to parse metadata: " + << "key=" << p.first << " error=" << error; }); } } @@ -192,9 +189,8 @@ static void recv_initial_metadata_locked(void* arg, RecvInitialMetadataArgs* args = static_cast(arg); grpc_binder_stream* stream = args->stream; - gpr_log(GPR_INFO, - "recv_initial_metadata_locked is_client = %d is_closed = %d", - stream->is_client, stream->is_closed); + LOG(INFO) << "recv_initial_metadata_locked is_client = " << stream->is_client + << " is_closed = " << stream->is_closed; if (!stream->is_closed) { grpc_error_handle error = [&] { @@ -230,8 +226,8 @@ static void recv_message_locked(void* arg, grpc_error_handle /*error*/) { RecvMessageArgs* args = static_cast(arg); grpc_binder_stream* stream = args->stream; - gpr_log(GPR_INFO, "recv_message_locked is_client = %d is_closed = %d", - stream->is_client, stream->is_closed); + LOG(INFO) << "recv_message_locked is_client = " << stream->is_client + << " is_closed = " << stream->is_closed; if (!stream->is_closed) { grpc_error_handle error = [&] { @@ -273,9 +269,8 @@ static void recv_trailing_metadata_locked(void* arg, RecvTrailingMetadataArgs* args = static_cast(arg); grpc_binder_stream* stream = args->stream; - gpr_log(GPR_INFO, - "recv_trailing_metadata_locked is_client = %d is_closed = %d", - stream->is_client, stream->is_closed); + LOG(INFO) << "recv_trailing_metadata_locked is_client = " << stream->is_client + << " is_closed = " << stream->is_closed; if (!stream->is_closed) { grpc_error_handle error = [&] { @@ -378,8 +373,8 @@ static void accept_stream_locked(void* gt, grpc_error_handle /*error*/) { transport, transport); } else { ++transport->accept_stream_fn_called_count_; - gpr_log(GPR_INFO, "accept_stream_fn not set, current count = %d", - transport->accept_stream_fn_called_count_); + LOG(INFO) << "accept_stream_fn not set, current count = " + << transport->accept_stream_fn_called_count_; } } @@ -580,8 +575,8 @@ static void perform_stream_op_locked(void* stream_op, void grpc_binder_transport::PerformStreamOp( grpc_stream* gs, grpc_transport_stream_op_batch* op) { grpc_binder_stream* stream = reinterpret_cast(gs); - gpr_log(GPR_INFO, "%s = %p %p %p is_client = %d", __func__, this, gs, op, - stream->is_client); + LOG(INFO) << __func__ << " = " << this << " " << gs << " " << op + << " is_client = " << stream->is_client; GRPC_BINDER_STREAM_REF(stream, "perform_stream_op"); op->handler_private.extra_arg = stream; combiner->Run(GRPC_CLOSURE_INIT(&op->handler_private.closure, @@ -621,8 +616,8 @@ static void perform_transport_op_locked(void* transport_op, transport->accept_stream_fn = op->set_accept_stream_fn; transport->registered_method_matcher_cb = op->set_registered_method_matcher_fn; - gpr_log(GPR_DEBUG, "accept_stream_fn_called_count_ = %d", - transport->accept_stream_fn_called_count_); + VLOG(2) << "accept_stream_fn_called_count_ = " + << transport->accept_stream_fn_called_count_; while (transport->accept_stream_fn_called_count_ > 0) { --transport->accept_stream_fn_called_count_; transport->combiner->Run( @@ -647,7 +642,7 @@ static void perform_transport_op_locked(void* transport_op, } void grpc_binder_transport::PerformOp(grpc_transport_op* op) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; op->handler_private.extra_arg = this; GRPC_BINDER_REF_TRANSPORT(this, "perform_transport_op"); combiner->Run(GRPC_CLOSURE_INIT(&op->handler_private.closure, @@ -668,7 +663,7 @@ static void destroy_stream_locked(void* sp, grpc_error_handle /*error*/) { void grpc_binder_transport::DestroyStream(grpc_stream* gs, grpc_closure* then_schedule_closure) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; grpc_binder_stream* stream = reinterpret_cast(gs); stream->destroy_stream_then_closure = then_schedule_closure; stream->t->combiner->Run( @@ -688,7 +683,7 @@ static void destroy_transport_locked(void* gt, grpc_error_handle /*error*/) { } void grpc_binder_transport::Orphan() { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; combiner->Run(GRPC_CLOSURE_CREATE(destroy_transport_locked, this, nullptr), absl::OkStatus()); } @@ -707,7 +702,7 @@ grpc_binder_transport::grpc_binder_transport( is_client ? "binder_transport_client" : "binder_transport_server", GRPC_CHANNEL_READY), refs(1, nullptr) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; transport_stream_receiver = std::make_shared( is_client, /*accept_stream_callback=*/[this] { @@ -736,7 +731,7 @@ grpc_core::Transport* grpc_create_binder_transport_client( std::unique_ptr endpoint_binder, std::shared_ptr security_policy) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; CHECK(endpoint_binder != nullptr); CHECK_NE(security_policy, nullptr); @@ -751,7 +746,7 @@ grpc_core::Transport* grpc_create_binder_transport_server( std::unique_ptr client_binder, std::shared_ptr security_policy) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; CHECK(client_binder != nullptr); CHECK_NE(security_policy, nullptr); diff --git a/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.h b/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.h index 2039981876..1d7b43a7d1 100644 --- a/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.h +++ b/deps/grpc/src/core/ext/transport/binder/transport/binder_transport.h @@ -23,8 +23,8 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include diff --git a/deps/grpc/src/core/ext/transport/binder/utils/ndk_binder.cc b/deps/grpc/src/core/ext/transport/binder/utils/ndk_binder.cc index 08b0c824cb..79227a44c6 100644 --- a/deps/grpc/src/core/ext/transport/binder/utils/ndk_binder.cc +++ b/deps/grpc/src/core/ext/transport/binder/utils/ndk_binder.cc @@ -25,8 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include - #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/sync.h" @@ -36,9 +34,8 @@ void* GetNdkBinderHandle() { // first static void* handle = dlopen("libbinder_ndk.so", RTLD_LAZY); if (handle == nullptr) { - gpr_log( - GPR_ERROR, - "Cannot open libbinder_ndk.so. Does this device support API level 29?"); + LOG(ERROR) << "Cannot open libbinder_ndk.so. Does this device support API " + "level 29?"; CHECK(0); } return handle; @@ -101,10 +98,9 @@ namespace ndk_util { static func_type ptr = \ reinterpret_cast(dlsym(GetNdkBinderHandle(), #name)); \ if (ptr == nullptr) { \ - gpr_log(GPR_ERROR, \ - "dlsym failed. Cannot find %s in libbinder_ndk.so. " \ - "BinderTransport requires API level >= 33", \ - #name); \ + LOG(ERROR) << "dlsym failed. Cannot find " << #name \ + << " in libbinder_ndk.so. " \ + << "BinderTransport requires API level >= 33"; \ CHECK(0); \ } \ return ptr diff --git a/deps/grpc/src/core/ext/transport/binder/wire_format/binder_android.cc b/deps/grpc/src/core/ext/transport/binder/wire_format/binder_android.cc index 6ca9b6dcec..5e33262cd6 100644 --- a/deps/grpc/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/deps/grpc/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -25,8 +25,6 @@ #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" -#include - #include "src/core/ext/transport/binder/wire_format/binder_android.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/sync.h" @@ -65,7 +63,7 @@ ndk_util::binder_status_t f_onTransact(ndk_util::AIBinder* binder, transaction_code_t code, const ndk_util::AParcel* in, ndk_util::AParcel* /*out*/) { - gpr_log(GPR_INFO, __func__); + LOG(INFO) << __func__; LOG(INFO) << "tx code = " << code; auto* user_data = @@ -155,9 +153,8 @@ TransactionReceiverAndroid::TransactionReceiverAndroid( args.callback = &transact_cb_; binder_ = ndk_util::AIBinder_new(aibinder_class, &args); CHECK(binder_); - gpr_log(GPR_INFO, "ndk_util::AIBinder_associateClass = %d", - static_cast( - ndk_util::AIBinder_associateClass(binder_, aibinder_class))); + LOG(INFO) << "ndk_util::AIBinder_associateClass = " + << ndk_util::AIBinder_associateClass(binder_, aibinder_class); } TransactionReceiverAndroid::~TransactionReceiverAndroid() { @@ -181,9 +178,8 @@ void AssociateWithNoopClass(ndk_util::AIBinder* binder) { ndk_util::AIBinder_Class_disableInterfaceTokenHeader(aibinder_class); - gpr_log(GPR_INFO, "ndk_util::AIBinder_associateClass = %d", - static_cast( - ndk_util::AIBinder_associateClass(binder, aibinder_class))); + LOG(INFO) << "ndk_util::AIBinder_associateClass = " + << ndk_util::AIBinder_associateClass(binder, aibinder_class); } } // namespace diff --git a/deps/grpc/src/core/ext/transport/binder/wire_format/transaction.h b/deps/grpc/src/core/ext/transport/binder/wire_format/transaction.h index 30f4af67ee..971b3bdb9a 100644 --- a/deps/grpc/src/core/ext/transport/binder/wire_format/transaction.h +++ b/deps/grpc/src/core/ext/transport/binder/wire_format/transaction.h @@ -19,9 +19,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/deps/grpc/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc index 02cd6cf09c..bb01c89231 100644 --- a/deps/grpc/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc +++ b/deps/grpc/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc @@ -30,8 +30,6 @@ #include "absl/memory/memory.h" #include "absl/status/statusor.h" -#include - #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" @@ -109,11 +107,12 @@ std::shared_ptr WireReaderImpl::SetupTransport( void WireReaderImpl::SendSetupTransport(Binder* binder) { binder->Initialize(); - gpr_log(GPR_DEBUG, "prepare transaction = %d", - binder->PrepareTransaction().ok()); + const absl::Status prep_transaction_status = binder->PrepareTransaction(); + VLOG(2) << "prepare transaction = " << prep_transaction_status; WritableParcel* writable_parcel = binder->GetWritableParcel(); - gpr_log(GPR_DEBUG, "write int32 = %d", - writable_parcel->WriteInt32(kWireFormatVersion).ok()); + const absl::Status write_status = + writable_parcel->WriteInt32(kWireFormatVersion); + VLOG(2) << "write int32 = " << write_status; // The lifetime of the transaction receiver is the same as the wire writer's. // The transaction receiver is responsible for not calling the on-transact // callback when it's dead. @@ -127,11 +126,13 @@ void WireReaderImpl::SendSetupTransport(Binder* binder) { return this->ProcessTransaction(code, readable_parcel, uid); }); - gpr_log(GPR_DEBUG, "tx_receiver = %p", tx_receiver_->GetRawBinder()); - gpr_log(GPR_DEBUG, "AParcel_writeStrongBinder = %d", - writable_parcel->WriteBinder(tx_receiver_.get()).ok()); - gpr_log(GPR_DEBUG, "AIBinder_transact = %d", - binder->Transact(BinderTransportTxCode::SETUP_TRANSPORT).ok()); + VLOG(2) << "tx_receiver = " << tx_receiver_->GetRawBinder(); + const absl::Status write_binder_status = + writable_parcel->WriteBinder(tx_receiver_.get()); + VLOG(2) << "AParcel_writeStrongBinder = " << write_binder_status; + const absl::Status transact_status = + binder->Transact(BinderTransportTxCode::SETUP_TRANSPORT); + VLOG(2) << "AIBinder_transact = " << transact_status; } std::unique_ptr WireReaderImpl::RecvSetupTransport() { @@ -181,7 +182,7 @@ absl::Status WireReaderImpl::ProcessTransaction(transaction_code_t code, } recvd_setup_transport_ = true; - gpr_log(GPR_DEBUG, "calling uid = %d", uid); + VLOG(2) << "calling uid = " << uid; if (!security_policy_->IsAuthorized(uid)) { return absl::PermissionDeniedError( "UID " + std::to_string(uid) + @@ -191,14 +192,13 @@ absl::Status WireReaderImpl::ProcessTransaction(transaction_code_t code, int version; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&version)); - gpr_log(GPR_DEBUG, "The other end respond with version = %d", version); + VLOG(2) << "The other end respond with version = " << version; // We only support this single lowest possible version, so server must // respond that version too. if (version != kWireFormatVersion) { - gpr_log(GPR_ERROR, - "The other end respond with version = %d, but we requested " - "version %d, trying to continue anyway", - version, kWireFormatVersion); + LOG(ERROR) << "The other end respond with version = " << version + << ", but we requested version " << kWireFormatVersion + << ", trying to continue anyway"; } std::unique_ptr binder{}; GRPC_RETURN_IF_ERROR(parcel->ReadBinder(&binder)); @@ -218,7 +218,7 @@ absl::Status WireReaderImpl::ProcessTransaction(transaction_code_t code, case BinderTransportTxCode::ACKNOWLEDGE_BYTES: { int64_t num_bytes = -1; GRPC_RETURN_IF_ERROR(parcel->ReadInt64(&num_bytes)); - gpr_log(GPR_DEBUG, "received acknowledge bytes = %" PRId64, num_bytes); + VLOG(2) << "received acknowledge bytes = " << num_bytes; if (!wire_writer_ready_notification_.WaitForNotificationWithTimeout( absl::Seconds(5))) { return absl::DeadlineExceededError( @@ -233,14 +233,14 @@ absl::Status WireReaderImpl::ProcessTransaction(transaction_code_t code, } int ping_id = -1; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&ping_id)); - gpr_log(GPR_DEBUG, "received ping id = %d", ping_id); + VLOG(2) << "received ping id = " << ping_id; // TODO(waynetu): Ping back. break; } case BinderTransportTxCode::PING_RESPONSE: { int value = -1; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&value)); - gpr_log(GPR_DEBUG, "received ping response = %d", value); + VLOG(2) << "received ping response = " << value; break; } } @@ -283,8 +283,8 @@ absl::Status WireReaderImpl::ProcessStreamingTransaction( } if (!tx_process_result.ok()) { - gpr_log(GPR_ERROR, "Failed to process streaming transaction: %s", - tx_process_result.ToString().c_str()); + LOG(ERROR) << "Failed to process streaming transaction: " + << tx_process_result.ToString(); // Something went wrong when receiving transaction. Cancel failed requests. if (cancellation_flags & kFlagPrefix) { LOG(INFO) << "cancelling initial metadata"; @@ -327,7 +327,7 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( std::queue>& deferred_func_queue) { CHECK(cancellation_flags); num_incoming_bytes_ += parcel->GetDataSize(); - gpr_log(GPR_INFO, "Total incoming bytes: %" PRId64, num_incoming_bytes_); + LOG(INFO) << "Total incoming bytes: " << num_incoming_bytes_; int flags; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&flags)); @@ -344,10 +344,10 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( } int status = flags >> 16; - gpr_log(GPR_DEBUG, "status = %d", status); - gpr_log(GPR_DEBUG, "FLAG_PREFIX = %d", (flags & kFlagPrefix)); - gpr_log(GPR_DEBUG, "FLAG_MESSAGE_DATA = %d", (flags & kFlagMessageData)); - gpr_log(GPR_DEBUG, "FLAG_SUFFIX = %d", (flags & kFlagSuffix)); + VLOG(2) << "status = " << status; + VLOG(2) << "FLAG_PREFIX = " << (flags & kFlagPrefix); + VLOG(2) << "FLAG_MESSAGE_DATA = " << (flags & kFlagMessageData); + VLOG(2) << "FLAG_SUFFIX = " << (flags & kFlagSuffix); int seq_num; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&seq_num)); // TODO(waynetu): For now we'll just assume that the transactions commit in @@ -365,7 +365,7 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( CHECK(expectation < std::numeric_limits::max()) << "Sequence number too large"; expectation++; - gpr_log(GPR_DEBUG, "sequence number = %d", seq_num); + VLOG(2) << "sequence number = " << seq_num; if (flags & kFlagPrefix) { std::string method_ref; if (!is_client_) { @@ -405,7 +405,7 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( if (flags & kFlagMessageData) { int count; GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&count)); - gpr_log(GPR_DEBUG, "count = %d", count); + VLOG(2) << "count = " << count; std::string msg_data{}; if (count > 0) { GRPC_RETURN_IF_ERROR(parcel->ReadByteArray(&msg_data)); @@ -425,7 +425,7 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( // FLAG_STATUS_DESCRIPTION set std::string desc; GRPC_RETURN_IF_ERROR(parcel->ReadString(&desc)); - gpr_log(GPR_DEBUG, "description = %s", desc.c_str()); + VLOG(2) << "description = " << desc; } Metadata trailing_metadata; if (is_client_) { diff --git a/deps/grpc/src/core/ext/transport/binder/wire_format/wire_writer.cc b/deps/grpc/src/core/ext/transport/binder/wire_format/wire_writer.cc index 6379bd17ff..1b954e1d26 100644 --- a/deps/grpc/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/deps/grpc/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -25,8 +25,6 @@ #include "absl/log/log.h" #include "absl/types/variant.h" -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/crash.h" @@ -114,15 +112,13 @@ absl::Status WireWriterImpl::MakeBinderTransaction( if (static_cast(tx_code) >= kFirstCallId) { int64_t parcel_size = parcel->GetDataSize(); if (parcel_size > 2 * kBlockSize) { - gpr_log(GPR_ERROR, - "Unexpected large transaction (possibly caused by a very large " - "metadata). This might overflow the binder " - "transaction buffer. Size: %" PRId64 " bytes", - parcel_size); + LOG(ERROR) << "Unexpected large transaction (possibly caused by a very " + "large metadata). This might overflow the binder " + "transaction buffer. Size: " + << parcel_size << " bytes"; } num_outgoing_bytes_ += parcel_size; - gpr_log(GPR_INFO, "Total outgoing bytes: %" PRId64, - num_outgoing_bytes_.load()); + LOG(INFO) << "Total outgoing bytes: " << num_outgoing_bytes_.load(); } CHECK(!is_transacting_); is_transacting_ = true; @@ -333,10 +329,9 @@ void WireWriterImpl::OnAckReceived(int64_t num_bytes) { num_acknowledged_bytes_ = std::max(num_acknowledged_bytes_, num_bytes); int64_t num_outgoing_bytes = num_outgoing_bytes_; if (num_acknowledged_bytes_ > num_outgoing_bytes) { - gpr_log(GPR_ERROR, - "The other end of transport acked more bytes than we ever sent, " - "%" PRId64 " > %" PRId64, - num_acknowledged_bytes_, num_outgoing_bytes); + LOG(ERROR) << "The other end of transport acked more bytes than we ever " + "sent, " + << num_acknowledged_bytes_ << " > " << num_outgoing_bytes; } } TryScheduleTransaction(); @@ -366,11 +361,9 @@ void WireWriterImpl::TryScheduleTransaction() { int64_t num_non_acked_bytes_estimation = num_total_bytes_will_be_sent - num_acknowledged_bytes_; if (num_non_acked_bytes_estimation < 0) { - gpr_log( - GPR_ERROR, - "Something went wrong. `num_non_acked_bytes_estimation` should be " - "non-negative but it is %" PRId64, - num_non_acked_bytes_estimation); + LOG(ERROR) << "Something went wrong. `num_non_acked_bytes_estimation` " + "should be non-negative but it is " + << num_non_acked_bytes_estimation; } // If we can schedule another transaction (which has size estimation of // `kBlockSize`) without exceeding `kFlowControlWindowSize`, schedule it. @@ -384,13 +377,13 @@ void WireWriterImpl::TryScheduleTransaction() { } else { // It is common to fill `kFlowControlWindowSize` completely because // transactions are send at faster rate than the other end of transport - // can handle it, so here we use `GPR_DEBUG` log level. - gpr_log(GPR_DEBUG, - "Some work cannot be scheduled yet due to slow ack from the " - "other end of transport. This transport might be blocked if this " - "number don't go down. pending_outgoing_tx_.size() = %zu " - "pending_outgoing_tx_.front() = %p", - pending_outgoing_tx_.size(), pending_outgoing_tx_.front()); + // can handle it, so here we use VLOG(2). + VLOG(2) << "Some work cannot be scheduled yet due to slow ack from the " + "other end of transport. This transport might be blocked if " + "this number don't go down. pending_outgoing_tx_.size() = " + << pending_outgoing_tx_.size() + << " pending_outgoing_tx_.front() = " + << pending_outgoing_tx_.front(); break; } } diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/deps/grpc/src/core/ext/transport/chaotic_good/chaotic_good_transport.h index 3230d6f425..b3df1ceb1e 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/chaotic_good_transport.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/chaotic_good_transport.h @@ -18,6 +18,7 @@ #include #include +#include "absl/log/log.h" #include "absl/random/random.h" #include @@ -55,13 +56,11 @@ class ChaoticGoodTransport : public RefCounted { bool saw_encoding_errors = false; auto buffers = frame.Serialize(&encoder_, saw_encoding_errors); // ignore encoding errors: they will be logged separately already - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: WriteFrame to:%s %s", - ResolvedAddressToString(control_endpoint_.GetPeerAddress()) - .value_or("<>") - .c_str(), - frame.ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: WriteFrame to:" + << ResolvedAddressToString(control_endpoint_.GetPeerAddress()) + .value_or("<>") + << " " << frame.ToString(); return TryJoin( control_endpoint_.Write(std::move(buffers.control)), data_endpoint_.Write(std::move(buffers.data))); @@ -76,15 +75,13 @@ class ChaoticGoodTransport : public RefCounted { auto frame_header = FrameHeader::Parse(reinterpret_cast( GRPC_SLICE_START_PTR(read_buffer.c_slice()))); - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: ReadHeader from:%s %s", - ResolvedAddressToString(control_endpoint_.GetPeerAddress()) - .value_or("<>") - .c_str(), - frame_header.ok() - ? frame_header->ToString().c_str() - : frame_header.status().ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: ReadHeader from:" + << ResolvedAddressToString(control_endpoint_.GetPeerAddress()) + .value_or("<>") + << " " + << (frame_header.ok() ? frame_header->ToString() + : frame_header.status().ToString()); // Read header and trailers from control endpoint. // Read message padding and message from data endpoint. return If( @@ -125,10 +122,9 @@ class ChaoticGoodTransport : public RefCounted { FrameLimits limits) { auto s = frame.Deserialize(&parser_, header, bitgen_, arena, std::move(buffers), limits); - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: DeserializeFrame %s", - s.ok() ? frame.ToString().c_str() : s.ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: DeserializeFrame " + << (s.ok() ? frame.ToString() : s.ToString()); return s; } diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index 0f71d509ba..be3dfa83f5 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -19,6 +19,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/bit_gen_ref.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -36,6 +37,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" @@ -59,7 +61,6 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/error_utils.h" @@ -76,7 +77,10 @@ const int32_t kTimeoutSecs = 120; ChaoticGoodConnector::ChaoticGoodConnector( std::shared_ptr event_engine) : event_engine_(std::move(event_engine)), - handshake_mgr_(std::make_shared()) {} + handshake_mgr_(MakeRefCounted()) { + arena_->SetContext( + event_engine_.get()); +} ChaoticGoodConnector::~ChaoticGoodConnector() { CHECK_EQ(notify_, nullptr); @@ -130,9 +134,12 @@ auto ChaoticGoodConnector::WaitForDataEndpointSetup( endpoint) mutable { ExecCtx exec_ctx; if (!endpoint.ok() || self->handshake_mgr_ == nullptr) { - ExecCtx::Run(DEBUG_LOCATION, - std::exchange(self->notify_, nullptr), - GRPC_ERROR_CREATE("connect endpoint failed")); + MutexLock lock(&self->mu_); + if (self->notify_ != nullptr) { + ExecCtx::Run(DEBUG_LOCATION, + std::exchange(self->notify_, nullptr), + GRPC_ERROR_CREATE("connect endpoint failed")); + } return; } auto* chaotic_good_ext = @@ -236,9 +243,9 @@ void ChaoticGoodConnector::Connect(const Args& args, Result* result, GRPC_ERROR_CREATE("connector shutdown")); return; } + notify_ = notify; } args_ = args; - notify_ = notify; resolved_addr_ = EventEngine::ResolvedAddress( reinterpret_cast(args_.address->addr), args_.address->len); @@ -249,27 +256,33 @@ void ChaoticGoodConnector::Connect(const Args& args, Result* result, endpoint) mutable { ExecCtx exec_ctx; if (!endpoint.ok() || self->handshake_mgr_ == nullptr) { - auto endpoint_status = endpoint.status(); - auto error = GRPC_ERROR_CREATE_REFERENCING("connect endpoint failed", - &endpoint_status, 1); - ExecCtx::Run(DEBUG_LOCATION, std::exchange(self->notify_, nullptr), - error); + MutexLock lock(&self->mu_); + if (self->notify_ != nullptr) { + auto endpoint_status = endpoint.status(); + auto error = GRPC_ERROR_CREATE_REFERENCING( + "connect endpoint failed", &endpoint_status, 1); + ExecCtx::Run(DEBUG_LOCATION, std::exchange(self->notify_, nullptr), + error); + } return; } - auto* p = self.release(); auto* chaotic_good_ext = grpc_event_engine::experimental::QueryExtension< grpc_event_engine::experimental::ChaoticGoodExtension>( - endpoint.value().get()); + endpoint->get()); if (chaotic_good_ext != nullptr) { chaotic_good_ext->EnableStatsCollection(/*is_control_channel=*/true); chaotic_good_ext->UseMemoryQuota( ResourceQuota::Default()->memory_quota()); } + auto* p = self.get(); p->handshake_mgr_->DoHandshake( - grpc_event_engine_endpoint_create(std::move(endpoint.value())), + OrphanablePtr( + grpc_event_engine_endpoint_create(std::move(*endpoint))), p->args_.channel_args, p->args_.deadline, nullptr /* acceptor */, - OnHandshakeDone, p); + [self = std::move(self)](absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); }; event_engine_->Connect( std::move(on_connect), *resolved_addr_, @@ -280,51 +293,41 @@ void ChaoticGoodConnector::Connect(const Args& args, Result* result, std::chrono::seconds(kTimeoutSecs)); } -void ChaoticGoodConnector::OnHandshakeDone(void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - RefCountedPtr self( - static_cast(args->user_data)); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); +void ChaoticGoodConnector::OnHandshakeDone( + absl::StatusOr result) { // Start receiving setting frames; { - MutexLock lock(&self->mu_); - if (!error.ok() || self->is_shutdown_) { - if (error.ok()) { + MutexLock lock(&mu_); + if (!result.ok() || is_shutdown_) { + absl::Status error = result.status(); + if (result.ok()) { error = GRPC_ERROR_CREATE("connector shutdown"); - // We were shut down after handshaking completed successfully, so - // destroy the endpoint here. - if (args->endpoint != nullptr) { - grpc_endpoint_destroy(args->endpoint); - } } - self->result_->Reset(); - ExecCtx::Run(DEBUG_LOCATION, std::exchange(self->notify_, nullptr), - error); + result_->Reset(); + ExecCtx::Run(DEBUG_LOCATION, std::exchange(notify_, nullptr), error); return; } } - if (args->endpoint != nullptr) { + if ((*result)->endpoint != nullptr) { CHECK(grpc_event_engine::experimental::grpc_is_event_engine_endpoint( - args->endpoint)); - self->control_endpoint_ = PromiseEndpoint( - grpc_event_engine::experimental:: - grpc_take_wrapped_event_engine_endpoint(args->endpoint), - SliceBuffer()); + (*result)->endpoint.get())); + control_endpoint_ = + PromiseEndpoint(grpc_event_engine::experimental:: + grpc_take_wrapped_event_engine_endpoint( + (*result)->endpoint.release()), + SliceBuffer()); auto activity = MakeActivity( - [self] { + [self = RefAsSubclass()] { return TrySeq(ControlEndpointWriteSettingsFrame(self), ControlEndpointReadSettingsFrame(self), []() { return absl::OkStatus(); }); }, - EventEngineWakeupScheduler(self->event_engine_), - [self](absl::Status status) { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "ChaoticGoodConnector::OnHandshakeDone: %s", - status.ToString().c_str()); - } + EventEngineWakeupScheduler(event_engine_), + [self = RefAsSubclass()](absl::Status status) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "ChaoticGoodConnector::OnHandshakeDone: " << status; + MutexLock lock(&self->mu_); if (status.ok()) { - MutexLock lock(&self->mu_); self->result_->transport = new ChaoticGoodClientTransport( std::move(self->control_endpoint_), std::move(self->data_endpoint_), self->args_.channel_args, @@ -338,17 +341,19 @@ void ChaoticGoodConnector::OnHandshakeDone(void* arg, grpc_error_handle error) { status); } }, - self->arena_, self->event_engine_.get()); - MutexLock lock(&self->mu_); - if (!self->is_shutdown_) { - self->connect_activity_ = std::move(activity); + arena_); + MutexLock lock(&mu_); + if (!is_shutdown_) { + connect_activity_ = std::move(activity); } } else { // Handshaking succeeded but there is no endpoint. - MutexLock lock(&self->mu_); - self->result_->Reset(); + MutexLock lock(&mu_); + result_->Reset(); auto error = GRPC_ERROR_CREATE("handshake complete with empty endpoint."); - ExecCtx::Run(DEBUG_LOCATION, std::exchange(self->notify_, nullptr), error); + ExecCtx::Run( + DEBUG_LOCATION, std::exchange(notify_, nullptr), + absl::InternalError("handshake complete with empty endpoint.")); } } @@ -372,8 +377,9 @@ class ChaoticGoodChannelFactory final : public ClientChannelFactory { grpc_channel* grpc_chaotic_good_channel_create(const char* target, const grpc_channel_args* args) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE("grpc_chaotic_good_channel_create(target=%s, args=%p)", 2, - (target, (void*)args)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_chaotic_good_channel_create(target=" << target + << ", args=" << (void*)args << ")"; grpc_channel* channel = nullptr; grpc_error_handle error; // Create channel. diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index b8db7a5250..5078d38436 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -77,13 +77,13 @@ class ChaoticGoodConnector : public SubchannelConnector { RefCountedPtr self); static auto WaitForDataEndpointSetup( RefCountedPtr self); - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); RefCountedPtr arena_ = SimpleArenaAllocator()->MakeArena(); Mutex mu_; Args args_; Result* result_ ABSL_GUARDED_BY(mu_); - grpc_closure* notify_ = nullptr; + grpc_closure* notify_ ABSL_GUARDED_BY(mu_) = nullptr; bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; absl::StatusOr resolved_addr_; @@ -93,7 +93,7 @@ class ChaoticGoodConnector : public SubchannelConnector { ActivityPtr connect_activity_ ABSL_GUARDED_BY(mu_); const std::shared_ptr event_engine_; - std::shared_ptr handshake_mgr_; + RefCountedPtr handshake_mgr_; HPackCompressor hpack_compressor_; HPackParser hpack_parser_; absl::BitGen bitgen_; diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.cc b/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.cc index ddcdaa12ea..3249ff33b3 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.cc @@ -22,13 +22,14 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/bit_gen_ref.h" #include "absl/random/random.h" +#include "absl/status/status.h" #include "absl/status/statusor.h" #include #include -#include #include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" @@ -56,6 +57,20 @@ namespace grpc_core { namespace chaotic_good { +void ChaoticGoodClientTransport::Orphan() { + AbortWithError(); + ActivityPtr writer; + ActivityPtr reader; + { + MutexLock lock(&mu_); + writer = std::move(writer_); + reader = std::move(reader_); + } + writer.reset(); + reader.reset(); + Unref(); +} + auto ChaoticGoodClientTransport::TransportWriteLoop( RefCountedPtr transport) { return Loop([this, transport = std::move(transport)] { @@ -87,11 +102,11 @@ absl::optional ChaoticGoodClientTransport::LookupStream( auto ChaoticGoodClientTransport::PushFrameIntoCall(ServerFragmentFrame frame, CallHandler call_handler) { - auto& headers = frame.headers; + const bool has_headers = frame.headers != nullptr; auto push = TrySeq( If( - headers != nullptr, - [call_handler, &headers]() mutable { + has_headers, + [call_handler, headers = std::move(frame.headers)]() mutable { return call_handler.PushServerInitialMetadata(std::move(headers)); }, []() -> StatusFlag { return Success{}; }), @@ -158,9 +173,7 @@ auto ChaoticGoodClientTransport::TransportReadLoop( frame = std::move(frame)]() mutable { return Map(call_handler.CancelIfFails(PushFrameIntoCall( std::move(frame), call_handler)), - [](StatusFlag f) { - return StatusCast(f); - }); + [](StatusFlag) { return absl::OkStatus(); }); }); }, [&deserialize_status]() { @@ -175,8 +188,15 @@ auto ChaoticGoodClientTransport::TransportReadLoop( }); } -auto ChaoticGoodClientTransport::OnTransportActivityDone() { - return [this](absl::Status) { AbortWithError(); }; +auto ChaoticGoodClientTransport::OnTransportActivityDone( + absl::string_view what) { + return [self = RefAsSubclass(), + what](absl::Status status) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Client transport " << self.get() << " closed (via " + << what << "): " << status; + self->AbortWithError(); + }; } ChaoticGoodClientTransport::ChaoticGoodClientTransport( @@ -194,11 +214,12 @@ ChaoticGoodClientTransport::ChaoticGoodClientTransport( writer_ = MakeActivity( // Continuously write next outgoing frames to promise endpoints. TransportWriteLoop(transport), EventEngineWakeupScheduler(event_engine), - OnTransportActivityDone()); + OnTransportActivityDone("write_loop")); reader_ = MakeActivity( // Continuously read next incoming frames from promise endpoints. TransportReadLoop(std::move(transport)), - EventEngineWakeupScheduler(event_engine), OnTransportActivityDone()); + EventEngineWakeupScheduler(event_engine), + OnTransportActivityDone("read_loop")); } ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { @@ -233,9 +254,14 @@ uint32_t ChaoticGoodClientTransport::MakeStream(CallHandler call_handler) { const uint32_t stream_id = next_stream_id_++; stream_map_.emplace(stream_id, call_handler); lock.Release(); - call_handler.OnDone([this, stream_id]() { - MutexLock lock(&mu_); - stream_map_.erase(stream_id); + call_handler.OnDone([self = RefAsSubclass(), + stream_id](bool cancelled) { + if (cancelled) { + self->outgoing_frames_.MakeSender().UnbufferedImmediateSend( + CancelFrame{stream_id}); + } + MutexLock lock(&self->mu_); + self->stream_map_.erase(stream_id); }); return stream_id; } @@ -259,10 +285,8 @@ auto ChaoticGoodClientTransport::CallOutboundLoop(uint32_t stream_id, // Wait for initial metadata then send it out. call_handler.PullClientInitialMetadata(), [send_fragment](ClientMetadataHandle md) mutable { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: Sending initial metadata: %s", - md->DebugString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Sending initial metadata: " << md->DebugString(); ClientFragmentFrame frame; frame.headers = std::move(md); return send_fragment(std::move(frame)); @@ -294,23 +318,28 @@ auto ChaoticGoodClientTransport::CallOutboundLoop(uint32_t stream_id, void ChaoticGoodClientTransport::StartCall(CallHandler call_handler) { // At this point, the connection is set up. // Start sending data frames. - call_handler.SpawnGuarded("outbound_loop", [this, call_handler]() mutable { - const uint32_t stream_id = MakeStream(call_handler); - return Map(CallOutboundLoop(stream_id, call_handler), - [stream_id, this](absl::Status result) { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: Call %d finished with %s", - stream_id, result.ToString().c_str()); - } - if (!result.ok()) { - CancelFrame frame; - frame.stream_id = stream_id; - outgoing_frames_.MakeSender().UnbufferedImmediateSend( - std::move(frame)); - } - return result; - }); - }); + call_handler.SpawnGuarded( + "outbound_loop", [self = RefAsSubclass(), + call_handler]() mutable { + const uint32_t stream_id = self->MakeStream(call_handler); + return Map( + self->CallOutboundLoop(stream_id, call_handler), + [stream_id, sender = self->outgoing_frames_.MakeSender()]( + absl::Status result) mutable { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Call " << stream_id << " finished with " + << result.ToString(); + if (!result.ok()) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Send cancel"; + if (!sender.UnbufferedImmediateSend(CancelFrame{stream_id})) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Send cancel failed"; + } + } + return result; + }); + }); } void ChaoticGoodClientTransport::PerformOp(grpc_transport_op* op) { diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.h b/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.h index 12a96403d9..47dacc23bc 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/client_transport.h @@ -82,10 +82,7 @@ class ChaoticGoodClientTransport final : public ClientTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override; - void Orphan() override { - AbortWithError(); - Unref(); - } + void Orphan() override; void StartCall(CallHandler call_handler) override; void AbortWithError(); @@ -99,7 +96,7 @@ class ChaoticGoodClientTransport final : public ClientTransport { uint32_t MakeStream(CallHandler call_handler); absl::optional LookupStream(uint32_t stream_id); auto CallOutboundLoop(uint32_t stream_id, CallHandler call_handler); - auto OnTransportActivityDone(); + auto OnTransportActivityDone(absl::string_view what); auto TransportWriteLoop(RefCountedPtr transport); auto TransportReadLoop(RefCountedPtr transport); // Push one frame into a call diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/frame.cc b/deps/grpc/src/core/ext/transport/chaotic_good/frame.cc index bbfb25d1b3..243d8ef4ca 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/frame.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/frame.cc @@ -25,7 +25,6 @@ #include "absl/status/statusor.h" #include -#include #include #include "src/core/ext/transport/chaotic_good/frame_header.h" @@ -154,7 +153,7 @@ absl::StatusOr> ReadMetadata( if (!maybe_slices.ok()) return maybe_slices.status(); auto& slices = *maybe_slices; CHECK_NE(arena, nullptr); - Arena::PoolPtr metadata = Arena::MakePooled(); + Arena::PoolPtr metadata = Arena::MakePooledForOverwrite(); parser->BeginFrame( metadata.get(), std::numeric_limits::max(), std::numeric_limits::max(), diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/frame.h b/deps/grpc/src/core/ext/transport/chaotic_good/frame.h index d521a48310..548280858b 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/frame.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/frame.h @@ -156,6 +156,9 @@ struct ServerFragmentFrame final : public FrameInterface { }; struct CancelFrame final : public FrameInterface { + CancelFrame() = default; + explicit CancelFrame(uint32_t stream_id) : stream_id(stream_id) {} + absl::Status Deserialize(HPackParser* parser, const FrameHeader& header, absl::BitGenRef bitsrc, Arena* arena, BufferPair buffers, FrameLimits limits) override; diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/frame_header.cc b/deps/grpc/src/core/ext/transport/chaotic_good/frame_header.cc index b4c27074ce..903e464641 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/frame_header.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/frame_header.cc @@ -19,7 +19,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index 3d207480df..2a70760292 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "src/core/ext/transport/chaotic_good/frame.h" @@ -114,8 +113,7 @@ absl::StatusOr ChaoticGoodServerListener::Bind( }; auto shutdown_cb = [](absl::Status status) { if (!status.ok()) { - gpr_log(GPR_ERROR, "Server accept connection failed: %s", - StatusToString(status).c_str()); + LOG(ERROR) << "Server accept connection failed: " << status; } }; CHECK_NE(event_engine_, nullptr); @@ -150,6 +148,8 @@ ChaoticGoodServerListener::ActiveConnection::ActiveConnection( RefCountedPtr listener, std::unique_ptr endpoint) : listener_(std::move(listener)) { + arena_->SetContext( + listener_->event_engine_.get()); handshaking_state_ = MakeRefCounted(Ref()); handshaking_state_->Start(std::move(endpoint)); } @@ -211,9 +211,12 @@ ChaoticGoodServerListener::ActiveConnection::HandshakingState::HandshakingState( void ChaoticGoodServerListener::ActiveConnection::HandshakingState::Start( std::unique_ptr endpoint) { handshake_mgr_->DoHandshake( - grpc_event_engine_endpoint_create(std::move(endpoint)), - connection_->args(), GetConnectionDeadline(), nullptr, OnHandshakeDone, - Ref().release()); + OrphanablePtr( + grpc_event_engine_endpoint_create(std::move(endpoint))), + connection_->args(), GetConnectionDeadline(), nullptr, + [self = Ref()](absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); } auto ChaoticGoodServerListener::ActiveConnection::HandshakingState:: @@ -297,12 +300,10 @@ auto ChaoticGoodServerListener::ActiveConnection::HandshakingState:: }, [self](PromiseEndpoint ret) -> absl::Status { MutexLock lock(&self->connection_->listener_->mu_); - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log( - GPR_INFO, "%p Data endpoint setup done: shutdown=%s", - self->connection_.get(), - self->connection_->listener_->shutdown_ ? "true" : "false"); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << self->connection_.get() + << " Data endpoint setup done: shutdown=" + << (self->connection_->listener_->shutdown_ ? "true" : "false"); if (self->connection_->listener_->shutdown_) { return absl::UnavailableError("Server shutdown"); } @@ -384,33 +385,28 @@ auto ChaoticGoodServerListener::ActiveConnection::HandshakingState:: } void ChaoticGoodServerListener::ActiveConnection::HandshakingState:: - OnHandshakeDone(void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - CHECK_NE(args, nullptr); - RefCountedPtr self( - static_cast(args->user_data)); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - if (!error.ok()) { - self->connection_->Done( - absl::StrCat("Handshake failed: ", StatusToString(error))); + OnHandshakeDone(absl::StatusOr result) { + if (!result.ok()) { + connection_->Done( + absl::StrCat("Handshake failed: ", result.status().ToString())); return; } - if (args->endpoint == nullptr) { - self->connection_->Done("Server handshake done but has empty endpoint."); + CHECK_NE(*result, nullptr); + if ((*result)->endpoint == nullptr) { + connection_->Done("Server handshake done but has empty endpoint."); return; } CHECK(grpc_event_engine::experimental::grpc_is_event_engine_endpoint( - args->endpoint)); + (*result)->endpoint.get())); auto ee_endpoint = grpc_event_engine::experimental::grpc_take_wrapped_event_engine_endpoint( - args->endpoint); + (*result)->endpoint.release()); auto* chaotic_good_ext = grpc_event_engine::experimental::QueryExtension< grpc_event_engine::experimental::ChaoticGoodExtension>(ee_endpoint.get()); - self->connection_->endpoint_ = + connection_->endpoint_ = PromiseEndpoint(std::move(ee_endpoint), SliceBuffer()); auto activity = MakeActivity( - [self, chaotic_good_ext]() { + [self = Ref(), chaotic_good_ext]() { return TrySeq( Race(EndpointReadSettingsFrame(self), TrySeq(Sleep(Timestamp::Now() + kConnectionDeadline), @@ -430,8 +426,8 @@ void ChaoticGoodServerListener::ActiveConnection::HandshakingState:: return EndpointWriteSettingsFrame(self, is_control_endpoint); }); }, - EventEngineWakeupScheduler(self->connection_->listener_->event_engine_), - [self](absl::Status status) { + EventEngineWakeupScheduler(connection_->listener_->event_engine_), + [self = Ref()](absl::Status status) { if (!status.ok()) { self->connection_->Done( absl::StrCat("Server setting frame handling failed: ", @@ -440,11 +436,10 @@ void ChaoticGoodServerListener::ActiveConnection::HandshakingState:: self->connection_->Done(); } }, - self->connection_->arena_.get(), - self->connection_->listener_->event_engine_.get()); - MutexLock lock(&self->connection_->mu_); - if (self->connection_->orphaned_) return; - self->connection_->receive_settings_activity_ = std::move(activity); + connection_->arena_.get()); + MutexLock lock(&connection_->mu_); + if (connection_->orphaned_) return; + connection_->receive_settings_activity_ = std::move(activity); } Timestamp ChaoticGoodServerListener::ActiveConnection::HandshakingState:: @@ -461,6 +456,7 @@ void ChaoticGoodServerListener::Orphan() { absl::flat_hash_set> connection_list; MutexLock lock(&mu_); connection_list = std::move(connection_list_); + connection_list_.clear(); shutdown_ = true; } ee_listener_.reset(); diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index 8511790c03..0b20dcbb36 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -83,7 +83,7 @@ class ChaoticGoodServerListener final : public Server::ListenerInterface { class HandshakingState : public RefCounted { public: explicit HandshakingState(RefCountedPtr connection); - ~HandshakingState() override{}; + ~HandshakingState() override {}; void Start(std::unique_ptr< grpc_event_engine::experimental::EventEngine::Endpoint> endpoint); @@ -104,7 +104,7 @@ class ChaoticGoodServerListener final : public Server::ListenerInterface { static auto DataEndpointWriteSettingsFrame( RefCountedPtr self); - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); Timestamp GetConnectionDeadline(); const RefCountedPtr connection_; const RefCountedPtr handshake_mgr_; diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.cc b/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.cc index 90d80641ec..6ffb6b7f06 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.cc @@ -19,6 +19,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/bit_gen_ref.h" #include "absl/random/random.h" #include "absl/status/status.h" @@ -27,13 +28,13 @@ #include #include #include -#include #include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" @@ -71,13 +72,10 @@ auto ChaoticGoodServerTransport::TransportWriteLoop( } auto ChaoticGoodServerTransport::PushFragmentIntoCall( - CallInitiator call_initiator, ClientFragmentFrame frame, - uint32_t stream_id) { + CallInitiator call_initiator, ClientFragmentFrame frame) { DCHECK(frame.headers == nullptr); - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: PushFragmentIntoCall: frame=%s", - frame.ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: PushFragmentIntoCall: frame=" << frame.ToString(); return Seq(If( frame.message.has_value(), [&call_initiator, &frame]() mutable { @@ -85,17 +83,15 @@ auto ChaoticGoodServerTransport::PushFragmentIntoCall( std::move(frame.message->message)); }, []() -> StatusFlag { return Success{}; }), - [this, call_initiator, end_of_stream = frame.end_of_stream, - stream_id](StatusFlag status) mutable -> StatusFlag { + [call_initiator, end_of_stream = frame.end_of_stream]( + StatusFlag status) mutable -> StatusFlag { if (!status.ok() && GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: Failed PushFragmentIntoCall"); + LOG(INFO) << "CHAOTIC_GOOD: Failed PushFragmentIntoCall"; } if (end_of_stream || !status.ok()) { call_initiator.FinishSends(); - // We have received end_of_stream. It is now safe to remove - // the call from the stream map. - MutexLock lock(&mu_); - stream_map_.erase(stream_id); + // Note that we cannot remove from the stream map yet, as we + // may yet receive a cancellation. } return Success{}; }); @@ -103,17 +99,16 @@ auto ChaoticGoodServerTransport::PushFragmentIntoCall( auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall( absl::optional call_initiator, absl::Status error, - ClientFragmentFrame frame, uint32_t stream_id) { + ClientFragmentFrame frame) { return If( call_initiator.has_value() && error.ok(), - [this, &call_initiator, &frame, &stream_id]() { + [this, &call_initiator, &frame]() { return Map( call_initiator->SpawnWaitable( "push-fragment", - [call_initiator, frame = std::move(frame), stream_id, - this]() mutable { - return call_initiator->CancelIfFails(PushFragmentIntoCall( - *call_initiator, std::move(frame), stream_id)); + [call_initiator, frame = std::move(frame), this]() mutable { + return call_initiator->CancelIfFails( + PushFragmentIntoCall(*call_initiator, std::move(frame))); }), [](StatusFlag status) { return StatusCast(status); }); }, @@ -123,10 +118,8 @@ auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall( // already been removed from the stream_map and hence the EOF frame // cannot be pushed into the call. No need to log such frames. if (!frame.end_of_stream) { - gpr_log( - GPR_INFO, - "CHAOTIC_GOOD: Cannot pass frame to stream. Error:%s Frame:%s", - error.ToString().c_str(), frame.ToString().c_str()); + LOG(INFO) << "CHAOTIC_GOOD: Cannot pass frame to stream. Error:" + << error.ToString() << " Frame:" << frame.ToString(); } return Immediate(std::move(error)); }); @@ -135,10 +128,8 @@ auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall( auto ChaoticGoodServerTransport::SendFragment( ServerFragmentFrame frame, MpscSender outgoing_frames, CallInitiator call_initiator) { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, "CHAOTIC_GOOD: SendFragment: frame=%s", - frame.ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: SendFragment: frame=" << frame.ToString(); // Capture the call_initiator to ensure the underlying call spine is alive // until the outgoing_frames.Send promise completes. return Map(outgoing_frames.Send(std::move(frame)), @@ -187,11 +178,9 @@ auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody( call_initiator.PullServerInitialMetadata(), [stream_id, outgoing_frames, call_initiator, this](absl::optional md) mutable { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, - "CHAOTIC_GOOD: SendCallInitialMetadataAndBody: md=%s", - md.has_value() ? (*md)->DebugString().c_str() : "null"); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: SendCallInitialMetadataAndBody: md=" + << (md.has_value() ? (*md)->DebugString() : "null"); return If( md.has_value(), [&md, stream_id, &outgoing_frames, &call_initiator, this]() { @@ -210,28 +199,25 @@ auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody( auto ChaoticGoodServerTransport::CallOutboundLoop( uint32_t stream_id, CallInitiator call_initiator) { auto outgoing_frames = outgoing_frames_.MakeSender(); - return Seq(Map(SendCallInitialMetadataAndBody(stream_id, outgoing_frames, - call_initiator), - [stream_id](absl::Status main_body_result) { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_DEBUG, - "CHAOTIC_GOOD: CallOutboundLoop: stream_id=%d " - "main_body_result=%s", - stream_id, main_body_result.ToString().c_str()); - } - return Empty{}; - }), - call_initiator.PullServerTrailingMetadata(), - // Capture the call_initator to ensure the underlying call_spine - // is alive until the SendFragment promise completes. - [stream_id, outgoing_frames, - call_initiator](ServerMetadataHandle md) mutable { - ServerFragmentFrame frame; - frame.trailers = std::move(md); - frame.stream_id = stream_id; - return SendFragment(std::move(frame), outgoing_frames, - call_initiator); - }); + return Seq( + Map(SendCallInitialMetadataAndBody(stream_id, outgoing_frames, + call_initiator), + [stream_id](absl::Status main_body_result) { + GRPC_TRACE_VLOG(chaotic_good, 2) + << "CHAOTIC_GOOD: CallOutboundLoop: stream_id=" << stream_id + << " main_body_result=" << main_body_result; + return Empty{}; + }), + call_initiator.PullServerTrailingMetadata(), + // Capture the call_initator to ensure the underlying call_spine + // is alive until the SendFragment promise completes. + [stream_id, outgoing_frames, + call_initiator](ServerMetadataHandle md) mutable { + ServerFragmentFrame frame; + frame.trailers = std::move(md); + frame.stream_id = stream_id; + return SendFragment(std::move(frame), outgoing_frames, call_initiator); + }); } auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall( @@ -239,13 +225,15 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall( ChaoticGoodTransport& transport) { ClientFragmentFrame fragment_frame; RefCountedPtr arena(call_arena_allocator_->MakeArena()); + arena->SetContext( + event_engine_.get()); absl::Status status = transport.DeserializeFrame( frame_header, std::move(buffers), arena.get(), fragment_frame, FrameLimits{1024 * 1024 * 1024, aligned_bytes_ - 1}); absl::optional call_initiator; if (status.ok()) { - auto call = MakeCallPair(std::move(fragment_frame.headers), - event_engine_.get(), std::move(arena)); + auto call = + MakeCallPair(std::move(fragment_frame.headers), std::move(arena)); call_initiator.emplace(std::move(call.initiator)); auto add_result = NewStream(frame_header.stream_id, *call_initiator); if (add_result.ok()) { @@ -261,8 +249,7 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall( } } return MaybePushFragmentIntoCall(std::move(call_initiator), std::move(status), - std::move(fragment_frame), - frame_header.stream_id); + std::move(fragment_frame)); } auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToExistingCall( @@ -277,8 +264,7 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToExistingCall( frame_header, std::move(buffers), arena, fragment_frame, FrameLimits{1024 * 1024 * 1024, aligned_bytes_ - 1}); return MaybePushFragmentIntoCall(std::move(call_initiator), std::move(status), - std::move(fragment_frame), - frame_header.stream_id); + std::move(fragment_frame)); } auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) { @@ -311,6 +297,10 @@ auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) { [this, &frame_header]() { absl::optional call_initiator = ExtractStream(frame_header.stream_id); + GRPC_TRACE_LOG(chaotic_good, INFO) + << "Cancel stream " << frame_header.stream_id + << (call_initiator.has_value() ? " (active)" + : " (not found)"); return If( call_initiator.has_value(), [&call_initiator]() { @@ -320,9 +310,7 @@ auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) { return absl::OkStatus(); }); }, - []() -> absl::Status { - return absl::InternalError("Unexpected cancel frame"); - }); + []() -> absl::Status { return absl::OkStatus(); }); }), Default([frame_header]() { return absl::InternalError( @@ -345,11 +333,9 @@ auto ChaoticGoodServerTransport::OnTransportActivityDone( absl::string_view activity) { return [self = RefAsSubclass(), activity](absl::Status status) { - if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { - gpr_log(GPR_INFO, - "CHAOTIC_GOOD: OnTransportActivityDone: activity=%s status=%s", - std::string(activity).c_str(), status.ToString().c_str()); - } + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: OnTransportActivityDone: activity=" << activity + << " status=" << status; self->AbortWithError(); }; } @@ -420,6 +406,8 @@ void ChaoticGoodServerTransport::AbortWithError() { absl::optional ChaoticGoodServerTransport::LookupStream( uint32_t stream_id) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD " << this << " LookupStream " << stream_id; MutexLock lock(&mu_); auto it = stream_map_.find(stream_id); if (it == stream_map_.end()) return absl::nullopt; @@ -428,6 +416,8 @@ absl::optional ChaoticGoodServerTransport::LookupStream( absl::optional ChaoticGoodServerTransport::ExtractStream( uint32_t stream_id) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD " << this << " ExtractStream " << stream_id; MutexLock lock(&mu_); auto it = stream_map_.find(stream_id); if (it == stream_map_.end()) return absl::nullopt; @@ -438,6 +428,8 @@ absl::optional ChaoticGoodServerTransport::ExtractStream( absl::Status ChaoticGoodServerTransport::NewStream( uint32_t stream_id, CallInitiator call_initiator) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD " << this << " NewStream " << stream_id; MutexLock lock(&mu_); auto it = stream_map_.find(stream_id); if (it != stream_map_.end()) { @@ -447,10 +439,20 @@ absl::Status ChaoticGoodServerTransport::NewStream( return absl::InternalError("Stream id is not increasing"); } stream_map_.emplace(stream_id, call_initiator); - call_initiator.OnDone([this, stream_id]() { - MutexLock lock(&mu_); - stream_map_.erase(stream_id); - }); + call_initiator.OnDone( + [self = RefAsSubclass(), stream_id](bool) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD " << self.get() << " OnDone " << stream_id; + absl::optional call_initiator = + self->ExtractStream(stream_id); + if (call_initiator.has_value()) { + auto c = std::move(*call_initiator); + c.SpawnInfallible("cancel", [c]() mutable { + c.Cancel(); + return Empty{}; + }); + } + }); return absl::OkStatus(); } diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.h b/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.h index 2cd1fb5974..246b25f731 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.h +++ b/deps/grpc/src/core/ext/transport/chaotic_good/server_transport.h @@ -42,7 +42,6 @@ #include #include #include -#include #include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" @@ -131,10 +130,9 @@ class ChaoticGoodServerTransport final : public ServerTransport { FrameHeader frame_header, BufferPair buffers, ChaoticGoodTransport& transport); auto MaybePushFragmentIntoCall(absl::optional call_initiator, - absl::Status error, ClientFragmentFrame frame, - uint32_t stream_id); + absl::Status error, ClientFragmentFrame frame); auto PushFragmentIntoCall(CallInitiator call_initiator, - ClientFragmentFrame frame, uint32_t stream_id); + ClientFragmentFrame frame); RefCountedPtr call_destination_; const RefCountedPtr call_arena_allocator_; diff --git a/deps/grpc/src/core/ext/transport/chaotic_good/settings_metadata.cc b/deps/grpc/src/core/ext/transport/chaotic_good/settings_metadata.cc index 9d395e8ae2..a6e5cc0299 100644 --- a/deps/grpc/src/core/ext/transport/chaotic_good/settings_metadata.cc +++ b/deps/grpc/src/core/ext/transport/chaotic_good/settings_metadata.cc @@ -24,7 +24,7 @@ namespace grpc_core { namespace chaotic_good { Arena::PoolPtr SettingsMetadata::ToMetadataBatch() { - auto md = Arena::MakePooled(); + auto md = Arena::MakePooledForOverwrite(); auto add = [&md](absl::string_view key, std::string value) { md->Append(key, Slice::FromCopiedString(value), [key, value](absl::string_view error, const Slice&) { diff --git a/deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.cc b/deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.cc index cb9c2d6e34..75f1740233 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/alpn/alpn.cc @@ -20,7 +20,6 @@ #include "absl/log/check.h" -#include #include #include "src/core/util/useful.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 3d4280ba35..48204fd2c6 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -66,7 +65,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" @@ -120,10 +118,12 @@ void Chttp2Connector::Connect(const Args& args, Result* result, CoreConfiguration::Get().handshaker_registry().AddHandshakers( HANDSHAKER_CLIENT, channel_args, args_.interested_parties, handshake_mgr_.get()); - Ref().release(); // Ref held by OnHandshakeDone(). - handshake_mgr_->DoHandshake(nullptr /* endpoint */, channel_args, - args.deadline, nullptr /* acceptor */, - OnHandshakeDone, this); + handshake_mgr_->DoHandshake( + /*endpoint=*/nullptr, channel_args, args.deadline, /*acceptor=*/nullptr, + [self = RefAsSubclass()]( + absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); } void Chttp2Connector::Shutdown(grpc_error_handle error) { @@ -135,56 +135,44 @@ void Chttp2Connector::Shutdown(grpc_error_handle error) { } } -void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - Chttp2Connector* self = static_cast(args->user_data); - { - MutexLock lock(&self->mu_); - if (!error.ok() || self->shutdown_) { - if (error.ok()) { - error = GRPC_ERROR_CREATE("connector shutdown"); - // We were shut down after handshaking completed successfully, so - // destroy the endpoint here. - if (args->endpoint != nullptr) { - grpc_endpoint_destroy(args->endpoint); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - } - } - self->result_->Reset(); - NullThenSchedClosure(DEBUG_LOCATION, &self->notify_, error); - } else if (args->endpoint != nullptr) { - self->result_->transport = - grpc_create_chttp2_transport(args->args, args->endpoint, true); - CHECK_NE(self->result_->transport, nullptr); - self->result_->socket_node = - grpc_chttp2_transport_get_socket_node(self->result_->transport); - self->result_->channel_args = args->args; - self->Ref().release(); // Ref held by OnReceiveSettings() - GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, self, - grpc_schedule_on_exec_ctx); - grpc_chttp2_transport_start_reading( - self->result_->transport, args->read_buffer, - &self->on_receive_settings_, self->args_.interested_parties, nullptr); - self->timer_handle_ = self->event_engine_->RunAfter( - self->args_.deadline - Timestamp::Now(), - [self = self->RefAsSubclass()]() mutable { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->OnTimeout(); - // Ensure the Chttp2Connector is deleted under an ExecCtx. - self.reset(); - }); - } else { - // If the handshaking succeeded but there is no endpoint, then the - // handshaker may have handed off the connection to some external - // code. Just verify that exit_early flag is set. - DCHECK(args->exit_early); - NullThenSchedClosure(DEBUG_LOCATION, &self->notify_, error); +void Chttp2Connector::OnHandshakeDone(absl::StatusOr result) { + MutexLock lock(&mu_); + if (!result.ok() || shutdown_) { + if (result.ok()) { + result = GRPC_ERROR_CREATE("connector shutdown"); } - self->handshake_mgr_.reset(); + result_->Reset(); + NullThenSchedClosure(DEBUG_LOCATION, ¬ify_, result.status()); + } else if ((*result)->endpoint != nullptr) { + result_->transport = grpc_create_chttp2_transport( + (*result)->args, std::move((*result)->endpoint), true); + CHECK_NE(result_->transport, nullptr); + result_->socket_node = + grpc_chttp2_transport_get_socket_node(result_->transport); + result_->channel_args = std::move((*result)->args); + Ref().release(); // Ref held by OnReceiveSettings() + GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this, + grpc_schedule_on_exec_ctx); + grpc_chttp2_transport_start_reading( + result_->transport, (*result)->read_buffer.c_slice_buffer(), + &on_receive_settings_, args_.interested_parties, nullptr); + timer_handle_ = event_engine_->RunAfter( + args_.deadline - Timestamp::Now(), + [self = RefAsSubclass()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnTimeout(); + // Ensure the Chttp2Connector is deleted under an ExecCtx. + self.reset(); + }); + } else { + // If the handshaking succeeded but there is no endpoint, then the + // handshaker may have handed off the connection to some external + // code. Just verify that exit_early flag is set. + DCHECK((*result)->exit_early); + NullThenSchedClosure(DEBUG_LOCATION, ¬ify_, result.status()); } - self->Unref(); + handshake_mgr_.reset(); } void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error_handle error) { @@ -248,10 +236,8 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { const grpc_resolved_address& address, const ChannelArgs& args) override { absl::StatusOr new_args = GetSecureNamingChannelArgs(args); if (!new_args.ok()) { - gpr_log(GPR_ERROR, - "Failed to create channel args during subchannel creation: %s; " - "Got args: %s", - new_args.status().ToString().c_str(), args.ToString().c_str()); + LOG(ERROR) << "Failed to create channel args during subchannel creation: " + << new_args.status() << "; Got args: " << args.ToString(); return nullptr; } RefCountedPtr s = Subchannel::Create( @@ -323,8 +309,9 @@ grpc_channel* grpc_channel_create(const char* target, grpc_channel_credentials* creds, const grpc_channel_args* c_args) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE("grpc_secure_channel_create(target=%s, creds=%p, args=%p)", 3, - (target, (void*)creds, (void*)c_args)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_secure_channel_create(target=" << target + << ", creds=" << (void*)creds << ", args=" << (void*)c_args << ")"; grpc_channel* channel = nullptr; grpc_error_handle error; if (creds != nullptr) { @@ -363,9 +350,9 @@ grpc_channel* grpc_channel_create_from_fd(const char* target, int fd, grpc_channel_credentials* creds, const grpc_channel_args* args) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE( - "grpc_channel_create_from_fd(target=%p, fd=%d, creds=%p, args=%p)", 4, - (target, fd, creds, args)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_channel_create_from_fd(target=" << target << ", fd=" << fd + << ", creds=" << creds << ", args=" << args << ")"; // For now, we only support insecure channel credentials. if (creds == nullptr || creds->type() != grpc_core::InsecureCredentials::Type()) { @@ -382,12 +369,12 @@ grpc_channel* grpc_channel_create_from_fd(const char* target, int fd, int flags = fcntl(fd, F_GETFL, 0); CHECK_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0); - grpc_endpoint* client = grpc_tcp_create_from_fd( + grpc_core::OrphanablePtr client(grpc_tcp_create_from_fd( grpc_fd_create(fd, "client", true), grpc_event_engine::experimental::ChannelArgsEndpointConfig(final_args), - "fd-client"); + "fd-client")); grpc_core::Transport* transport = - grpc_create_chttp2_transport(final_args, client, true); + grpc_create_chttp2_transport(final_args, std::move(client), true); CHECK(transport); auto channel = grpc_core::ChannelCreate( target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); diff --git a/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h b/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h index 679c7db6ce..0cb08474ca 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/deps/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -41,7 +41,7 @@ class Chttp2Connector : public SubchannelConnector { void Shutdown(grpc_error_handle error) override; private: - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); static void OnReceiveSettings(void* arg, grpc_error_handle error); void OnTimeout() ABSL_LOCKS_EXCLUDED(mu_); diff --git a/deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc b/deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc index b20d2a5554..50f165cd32 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -84,7 +84,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" @@ -107,6 +106,13 @@ const char kUnixUriPrefix[] = "unix:"; const char kUnixAbstractUriPrefix[] = "unix-abstract:"; const char kVSockUriPrefix[] = "vsock:"; +struct AcceptorDeleter { + void operator()(grpc_tcp_server_acceptor* acceptor) const { + gpr_free(acceptor); + } +}; +using AcceptorPtr = std::unique_ptr; + class Chttp2ServerListener : public Server::ListenerInterface { public: static grpc_error_handle Create(Server* server, grpc_resolved_address* addr, @@ -167,15 +173,15 @@ class Chttp2ServerListener : public Server::ListenerInterface { class HandshakingState : public InternallyRefCounted { public: HandshakingState(RefCountedPtr connection_ref, - grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, const ChannelArgs& args); ~HandshakingState() override; void Orphan() override; - void Start(grpc_endpoint* endpoint, const ChannelArgs& args); + void Start(OrphanablePtr endpoint, + const ChannelArgs& args); // Needed to be able to grab an external ref in // ActiveConnection::Start() @@ -184,10 +190,10 @@ class Chttp2ServerListener : public Server::ListenerInterface { private: void OnTimeout() ABSL_LOCKS_EXCLUDED(&connection_->mu_); static void OnReceiveSettings(void* arg, grpc_error_handle /* error */); - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); RefCountedPtr const connection_; grpc_pollset* const accepting_pollset_; - grpc_tcp_server_acceptor* acceptor_; + AcceptorPtr acceptor_; RefCountedPtr handshake_mgr_ ABSL_GUARDED_BY(&connection_->mu_); // State for enforcing handshake timeout on receiving HTTP/2 settings. @@ -198,18 +204,16 @@ class Chttp2ServerListener : public Server::ListenerInterface { grpc_pollset_set* const interested_parties_; }; - ActiveConnection(grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, + ActiveConnection(grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner); - ~ActiveConnection() override; void Orphan() override; void SendGoAway(); void Start(RefCountedPtr listener, - grpc_endpoint* endpoint, const ChannelArgs& args); + OrphanablePtr endpoint, const ChannelArgs& args); // Needed to be able to grab an external ref in // Chttp2ServerListener::OnAccept() @@ -367,11 +371,11 @@ Timestamp GetConnectionDeadline(const ChannelArgs& args) { Chttp2ServerListener::ActiveConnection::HandshakingState::HandshakingState( RefCountedPtr connection_ref, - grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, const ChannelArgs& args) : connection_(std::move(connection_ref)), accepting_pollset_(accepting_pollset), - acceptor_(acceptor), + acceptor_(std::move(acceptor)), handshake_mgr_(MakeRefCounted()), deadline_(GetConnectionDeadline(args)), interested_parties_(grpc_pollset_set_create()) { @@ -387,7 +391,10 @@ Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() { grpc_pollset_set_del_pollset(interested_parties_, accepting_pollset_); } grpc_pollset_set_destroy(interested_parties_); - gpr_free(acceptor_); + if (connection_->listener_ != nullptr && + connection_->listener_->tcp_server_ != nullptr) { + grpc_tcp_server_unref(connection_->listener_->tcp_server_); + } } void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { @@ -401,16 +408,18 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { } void Chttp2ServerListener::ActiveConnection::HandshakingState::Start( - grpc_endpoint* endpoint, const ChannelArgs& channel_args) { - Ref().release(); // Held by OnHandshakeDone + OrphanablePtr endpoint, const ChannelArgs& channel_args) { RefCountedPtr handshake_mgr; { MutexLock lock(&connection_->mu_); if (handshake_mgr_ == nullptr) return; handshake_mgr = handshake_mgr_; } - handshake_mgr->DoHandshake(endpoint, channel_args, deadline_, acceptor_, - OnHandshakeDone, this); + handshake_mgr->DoHandshake( + std::move(endpoint), channel_args, deadline_, acceptor_.get(), + [self = Ref()](absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); } void Chttp2ServerListener::ActiveConnection::HandshakingState::OnTimeout() { @@ -444,61 +453,50 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState:: } void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( - void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - HandshakingState* self = static_cast(args->user_data); + absl::StatusOr result) { OrphanablePtr handshaking_state_ref; RefCountedPtr handshake_mgr; bool cleanup_connection = false; bool release_connection = false; { - MutexLock connection_lock(&self->connection_->mu_); - if (!error.ok() || self->connection_->shutdown_) { - std::string error_str = StatusToString(error); + MutexLock connection_lock(&connection_->mu_); + if (!result.ok() || connection_->shutdown_) { cleanup_connection = true; release_connection = true; - if (error.ok() && args->endpoint != nullptr) { - // We were shut down or stopped serving after handshaking completed - // successfully, so destroy the endpoint here. - grpc_endpoint_destroy(args->endpoint); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - } } else { // If the handshaking succeeded but there is no endpoint, then the // handshaker may have handed off the connection to some external // code, so we can just clean up here without creating a transport. - if (args->endpoint != nullptr) { + if ((*result)->endpoint != nullptr) { RefCountedPtr transport = - grpc_create_chttp2_transport(args->args, args->endpoint, false) + grpc_create_chttp2_transport((*result)->args, + std::move((*result)->endpoint), false) ->Ref(); grpc_error_handle channel_init_err = - self->connection_->listener_->server_->SetupTransport( - transport.get(), self->accepting_pollset_, args->args, + connection_->listener_->server_->SetupTransport( + transport.get(), accepting_pollset_, (*result)->args, grpc_chttp2_transport_get_socket_node(transport.get())); if (channel_init_err.ok()) { // Use notify_on_receive_settings callback to enforce the // handshake deadline. - self->connection_->transport_ = + connection_->transport_ = DownCast(transport.get())->Ref(); - self->Ref().release(); // Held by OnReceiveSettings(). - GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, - self, grpc_schedule_on_exec_ctx); + Ref().release(); // Held by OnReceiveSettings(). + GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this, + grpc_schedule_on_exec_ctx); // If the listener has been configured with a config fetcher, we // need to watch on the transport being closed so that we can an // updated list of active connections. grpc_closure* on_close = nullptr; - if (self->connection_->listener_->config_fetcher_watcher_ != - nullptr) { + if (connection_->listener_->config_fetcher_watcher_ != nullptr) { // Refs helds by OnClose() - self->connection_->Ref().release(); - on_close = &self->connection_->on_close_; + connection_->Ref().release(); + on_close = &connection_->on_close_; } else { // Remove the connection from the connections_ map since OnClose() // will not be invoked when a config fetcher is set. auto connection_quota = - self->connection_->listener_->connection_quota_->Ref() - .release(); + connection_->listener_->connection_quota_->Ref().release(); auto on_close_transport = [](void* arg, grpc_error_handle /*handle*/) { ConnectionQuota* connection_quota = @@ -511,11 +509,10 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( cleanup_connection = true; } grpc_chttp2_transport_start_reading( - transport.get(), args->read_buffer, &self->on_receive_settings_, - nullptr, on_close); - self->timer_handle_ = self->connection_->event_engine_->RunAfter( - self->deadline_ - Timestamp::Now(), - [self = self->Ref()]() mutable { + transport.get(), (*result)->read_buffer.c_slice_buffer(), + &on_receive_settings_, nullptr, on_close); + timer_handle_ = connection_->event_engine_->RunAfter( + deadline_ - Timestamp::Now(), [self = Ref()]() mutable { ApplicationCallbackExecCtx callback_exec_ctx; ExecCtx exec_ctx; self->OnTimeout(); @@ -527,8 +524,6 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( LOG(ERROR) << "Failed to create channel: " << StatusToString(channel_init_err); transport->Orphan(); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); cleanup_connection = true; release_connection = true; } @@ -541,25 +536,21 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( // shutdown the handshake when the listener needs to stop serving. // Avoid calling the destructor of HandshakeManager and HandshakingState // from within the critical region. - handshake_mgr = std::move(self->handshake_mgr_); - handshaking_state_ref = std::move(self->connection_->handshaking_state_); + handshake_mgr = std::move(handshake_mgr_); + handshaking_state_ref = std::move(connection_->handshaking_state_); } - gpr_free(self->acceptor_); - self->acceptor_ = nullptr; OrphanablePtr connection; if (cleanup_connection) { - MutexLock listener_lock(&self->connection_->listener_->mu_); + MutexLock listener_lock(&connection_->listener_->mu_); if (release_connection) { - self->connection_->listener_->connection_quota_->ReleaseConnections(1); + connection_->listener_->connection_quota_->ReleaseConnections(1); } - auto it = self->connection_->listener_->connections_.find( - self->connection_.get()); - if (it != self->connection_->listener_->connections_.end()) { + auto it = connection_->listener_->connections_.find(connection_.get()); + if (it != connection_->listener_->connections_.end()) { connection = std::move(it->second); - self->connection_->listener_->connections_.erase(it); + connection_->listener_->connections_.erase(it); } } - self->Unref(); } // @@ -567,22 +558,16 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( // Chttp2ServerListener::ActiveConnection::ActiveConnection( - grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner) : handshaking_state_(memory_owner.MakeOrphanable( - Ref(), accepting_pollset, acceptor, args)), + Ref(), accepting_pollset, std::move(acceptor), args)), event_engine_(event_engine) { GRPC_CLOSURE_INIT(&on_close_, ActiveConnection::OnClose, this, grpc_schedule_on_exec_ctx); } -Chttp2ServerListener::ActiveConnection::~ActiveConnection() { - if (listener_ != nullptr && listener_->tcp_server_ != nullptr) { - grpc_tcp_server_unref(listener_->tcp_server_); - } -} - void Chttp2ServerListener::ActiveConnection::Orphan() { OrphanablePtr handshaking_state; { @@ -625,29 +610,21 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() { } void Chttp2ServerListener::ActiveConnection::Start( - RefCountedPtr listener, grpc_endpoint* endpoint, - const ChannelArgs& args) { - RefCountedPtr handshaking_state_ref; + RefCountedPtr listener, + OrphanablePtr endpoint, const ChannelArgs& args) { listener_ = std::move(listener); - if (listener_->tcp_server_ != nullptr) { - grpc_tcp_server_ref(listener_->tcp_server_); - } + RefCountedPtr handshaking_state_ref; { - ReleasableMutexLock lock(&mu_); - if (shutdown_) { - lock.Release(); - // If the Connection is already shutdown at this point, it implies the - // owning Chttp2ServerListener and all associated ActiveConnections have - // been orphaned. The generated endpoints need to be shutdown here to - // ensure the tcp connections are closed appropriately. - grpc_endpoint_destroy(endpoint); - return; - } + MutexLock lock(&mu_); + // If the Connection is already shutdown at this point, it implies the + // owning Chttp2ServerListener and all associated ActiveConnections have + // been orphaned. + if (shutdown_) return; // Hold a ref to HandshakingState to allow starting the handshake outside // the critical region. handshaking_state_ref = handshaking_state_->Ref(); } - handshaking_state_ref->Start(endpoint, args); + handshaking_state_ref->Start(std::move(endpoint), args); } void Chttp2ServerListener::ActiveConnection::OnClose( @@ -841,48 +818,41 @@ void Chttp2ServerListener::AcceptConnectedEndpoint( void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor) { + grpc_tcp_server_acceptor* server_acceptor) { Chttp2ServerListener* self = static_cast(arg); ChannelArgs args = self->args_; + OrphanablePtr endpoint(tcp); + AcceptorPtr acceptor(server_acceptor); RefCountedPtr connection_manager; { MutexLock lock(&self->mu_); connection_manager = self->connection_manager_; } - auto endpoint_cleanup = [&]() { - grpc_endpoint_destroy(tcp); - gpr_free(acceptor); - }; if (!self->connection_quota_->AllowIncomingConnection( - self->memory_quota_, grpc_endpoint_get_peer(tcp))) { - endpoint_cleanup(); + self->memory_quota_, grpc_endpoint_get_peer(endpoint.get()))) { return; } if (self->config_fetcher_ != nullptr) { if (connection_manager == nullptr) { - endpoint_cleanup(); return; } absl::StatusOr args_result = connection_manager->UpdateChannelArgsForConnection(args, tcp); if (!args_result.ok()) { - endpoint_cleanup(); return; } grpc_error_handle error; args = self->args_modifier_(*args_result, &error); if (!error.ok()) { - endpoint_cleanup(); return; } } auto memory_owner = self->memory_quota_->CreateMemoryOwner(); EventEngine* const event_engine = self->args_.GetObject(); auto connection = memory_owner.MakeOrphanable( - accepting_pollset, acceptor, event_engine, args, std::move(memory_owner)); - // We no longer own acceptor - acceptor = nullptr; + accepting_pollset, std::move(acceptor), event_engine, args, + std::move(memory_owner)); // Hold a ref to connection to allow starting handshake outside the // critical region RefCountedPtr connection_ref = connection->Ref(); @@ -893,19 +863,22 @@ void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, // connection manager has changed. if (!self->shutdown_ && self->is_serving_ && connection_manager == self->connection_manager_) { - // This ref needs to be taken in the critical region after having made - // sure that the listener has not been Orphaned, so as to avoid - // heap-use-after-free issues where `Ref()` is invoked when the ref of - // tcp_server_ has already reached 0. (Ref() implementation of - // Chttp2ServerListener is grpc_tcp_server_ref().) + // The ref for both the listener and tcp_server need to be taken in the + // critical region after having made sure that the listener has not been + // Orphaned, so as to avoid heap-use-after-free issues where `Ref()` is + // invoked when the listener is already shutdown. Note that the listener + // holds a ref to the tcp_server but this ref is given away when the + // listener is orphaned (shutdown). A connection needs the tcp_server to + // outlast the handshake since the acceptor needs it. + if (self->tcp_server_ != nullptr) { + grpc_tcp_server_ref(self->tcp_server_); + } listener_ref = self->RefAsSubclass(); self->connections_.emplace(connection.get(), std::move(connection)); } } - if (connection != nullptr) { - endpoint_cleanup(); - } else { - connection_ref->Start(std::move(listener_ref), tcp, args); + if (connection == nullptr && listener_ref != nullptr) { + connection_ref->Start(std::move(listener_ref), std::move(endpoint), args); } } @@ -1103,8 +1076,8 @@ int grpc_server_add_http2_port(grpc_server* server, const char* addr, int port_num = 0; grpc_core::Server* core_server = grpc_core::Server::FromC(server); grpc_core::ChannelArgs args = core_server->channel_args(); - GRPC_API_TRACE("grpc_server_add_http2_port(server=%p, addr=%s, creds=%p)", 3, - (server, addr, creds)); + GRPC_TRACE_LOG(api, INFO) << "grpc_server_add_http2_port(server=" << server + << ", addr=" << addr << ", creds=" << creds << ")"; // Create security context. if (creds == nullptr) { err = GRPC_ERROR_CREATE( @@ -1161,15 +1134,17 @@ void grpc_server_add_channel_from_fd(grpc_server* server, int fd, std::string name = absl::StrCat("fd:", fd); auto memory_quota = server_args.GetObject()->memory_quota(); - grpc_endpoint* server_endpoint = grpc_tcp_create_from_fd( - grpc_fd_create(fd, name.c_str(), true), - grpc_event_engine::experimental::ChannelArgsEndpointConfig(server_args), - name); + grpc_core::OrphanablePtr server_endpoint( + grpc_tcp_create_from_fd( + grpc_fd_create(fd, name.c_str(), true), + grpc_event_engine::experimental::ChannelArgsEndpointConfig( + server_args), + name)); for (grpc_pollset* pollset : core_server->pollsets()) { - grpc_endpoint_add_to_pollset(server_endpoint, pollset); + grpc_endpoint_add_to_pollset(server_endpoint.get(), pollset); } grpc_core::Transport* transport = grpc_create_chttp2_transport( - server_args, server_endpoint, false // is_client + server_args, std::move(server_endpoint), false // is_client ); grpc_error_handle error = core_server->SetupTransport(transport, nullptr, server_args, nullptr); @@ -1197,8 +1172,9 @@ absl::Status grpc_server_add_passive_listener( std::shared_ptr passive_listener) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE("grpc_server_add_passive_listener(server=%p, credentials=%p)", - 2, (server, credentials)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_server_add_passive_listener(server=" << server + << ", credentials=" << credentials << ")"; // Create security context. if (credentials == nullptr) { return absl::UnavailableError( diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc index ff23af19c3..8d00da86e5 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -20,9 +20,9 @@ #include "absl/base/attributes.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/slice/slice.h" @@ -58,10 +58,8 @@ static bool input_is_valid(const uint8_t* input_ptr, size_t length) { for (i = 0; i < length; ++i) { if (GPR_UNLIKELY((decode_table[input_ptr[i]] & 0xC0) != 0)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, invalid character '%c' in base64 " - "input.\n", - static_cast(*input_ptr)); + LOG(ERROR) << "Base64 decoding failed, invalid character '" + << static_cast(*input_ptr) << "' in base64 input.\n"; return false; } } @@ -89,17 +87,14 @@ size_t grpc_chttp2_base64_infer_length_after_decode(const grpc_slice& slice) { len--; } if (GPR_UNLIKELY(GRPC_SLICE_LENGTH(slice) - len > 2)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed. Input has more than 2 paddings."); + LOG(ERROR) << "Base64 decoding failed. Input has more than 2 paddings."; return 0; } size_t tuples = len / 4; size_t tail_case = len % 4; if (GPR_UNLIKELY(tail_case == 1)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed. Input has a length of %zu (without" - " padding), which is invalid.\n", - len); + LOG(ERROR) << "Base64 decoding failed. Input has a length of " << len + << " (without padding), which is invalid.\n"; return 0; } return tuples * 3 + tail_xtra[tail_case]; @@ -167,11 +162,9 @@ grpc_slice grpc_chttp2_base64_decode(const grpc_slice& input) { grpc_slice output; if (GPR_UNLIKELY(input_length % 4 != 0)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, input of " - "grpc_chttp2_base64_decode has a length of %d, which is not a " - "multiple of 4.\n", - static_cast(input_length)); + LOG(ERROR) << "Base64 decoding failed, input of " + "grpc_chttp2_base64_decode has a length of " + << input_length << ", which is not a multiple of 4.\n"; return grpc_empty_slice(); } @@ -194,7 +187,7 @@ grpc_slice grpc_chttp2_base64_decode(const grpc_slice& input) { if (GPR_UNLIKELY(!grpc_base64_decode_partial(&ctx))) { char* s = grpc_slice_to_c_string(input); - gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); + LOG(ERROR) << "Base64 decoding failed, input string:\n" << s << "\n"; gpr_free(s); grpc_core::CSliceUnref(output); return grpc_empty_slice(); @@ -212,23 +205,18 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input, // The length of a base64 string cannot be 4 * n + 1 if (GPR_UNLIKELY(input_length % 4 == 1)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, input of " - "grpc_chttp2_base64_decode_with_length has a length of %d, which " - "has a tail of 1 byte.\n", - static_cast(input_length)); + LOG(ERROR) << "Base64 decoding failed, input of " + "grpc_chttp2_base64_decode_with_length has a length of " + << input_length << ", which has a tail of 1 byte.\n"; grpc_core::CSliceUnref(output); return grpc_empty_slice(); } if (GPR_UNLIKELY(output_length > input_length / 4 * 3 + tail_xtra[input_length % 4])) { - gpr_log( - GPR_ERROR, - "Base64 decoding failed, output_length %d is longer " - "than the max possible output length %d.\n", - static_cast(output_length), - static_cast(input_length / 4 * 3 + tail_xtra[input_length % 4])); + LOG(ERROR) << "Base64 decoding failed, output_length " << output_length + << " is longer than the max possible output length " + << (input_length / 4 * 3 + tail_xtra[input_length % 4]) << ".\n"; grpc_core::CSliceUnref(output); return grpc_empty_slice(); } @@ -241,7 +229,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input, if (GPR_UNLIKELY(!grpc_base64_decode_partial(&ctx))) { char* s = grpc_slice_to_c_string(input); - gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); + LOG(ERROR) << "Base64 decoding failed, input string:\n" << s << "\n"; gpr_free(s); grpc_core::CSliceUnref(output); return grpc_empty_slice(); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc index cf024f03d4..4063d1d549 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" -#include #include #include "src/core/ext/transport/chttp2/transport/huffsyms.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 5e0599354b..d3c5d994c1 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -53,7 +53,6 @@ #include #include #include -#include #include #include @@ -66,7 +65,6 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" @@ -84,6 +82,7 @@ #include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/combiner.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -257,6 +256,7 @@ grpc_core::CopyContextFn g_get_copied_context_fn = nullptr; namespace grpc_core { namespace { + // Initialize a grpc_closure \a c to call \a Fn with \a t and \a error. Holds // the passed in reference to \a t until it's moved into Fn. template , grpc_error_handle)> @@ -272,13 +272,12 @@ grpc_closure* InitTransportClosure(RefCountedPtr t, t.release(), nullptr); return c; } -} // namespace -namespace { TestOnlyGlobalHttp2TransportInitCallback test_only_init_callback = nullptr; TestOnlyGlobalHttp2TransportDestructCallback test_only_destruct_callback = nullptr; bool test_only_disable_transient_failure_state_notification = false; + } // namespace void TestOnlySetGlobalHttp2TransportInitCallback( @@ -361,6 +360,34 @@ std::string HttpAnnotation::ToString() const { return s; } +void Chttp2CallTracerWrapper::RecordIncomingBytes( + const CallTracerInterface::TransportByteSize& transport_byte_size) { + // Update legacy API. + stream_->stats.incoming.framing_bytes += transport_byte_size.framing_bytes; + stream_->stats.incoming.data_bytes += transport_byte_size.data_bytes; + stream_->stats.incoming.header_bytes += transport_byte_size.header_bytes; + // Update new API. + if (!IsCallTracerInTransportEnabled()) return; + auto* call_tracer = stream_->arena->GetContext(); + if (call_tracer != nullptr) { + call_tracer->RecordIncomingBytes(transport_byte_size); + } +} + +void Chttp2CallTracerWrapper::RecordOutgoingBytes( + const CallTracerInterface::TransportByteSize& transport_byte_size) { + // Update legacy API. + stream_->stats.outgoing.framing_bytes += transport_byte_size.framing_bytes; + stream_->stats.outgoing.data_bytes += transport_byte_size.data_bytes; + stream_->stats.outgoing.header_bytes += + transport_byte_size.header_bytes; // Update new API. + if (!IsCallTracerInTransportEnabled()) return; + auto* call_tracer = stream_->arena->GetContext(); + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes(transport_byte_size); + } +} + } // namespace grpc_core // @@ -378,8 +405,6 @@ grpc_chttp2_transport::~grpc_chttp2_transport() { channelz_socket.reset(); } - if (ep != nullptr) grpc_endpoint_destroy(ep); - grpc_slice_buffer_destroy(&qbuf); grpc_error_handle error = GRPC_ERROR_CREATE("Transport destroyed"); @@ -420,9 +445,9 @@ static void read_channel_args(grpc_chttp2_transport* t, channel_args.GetInt(GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER).value_or(-1); if (initial_sequence_number > 0) { if ((t->next_stream_id & 1) != (initial_sequence_number & 1)) { - gpr_log(GPR_ERROR, "%s: low bit must be %d on %s", - GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, t->next_stream_id & 1, - is_client ? "client" : "server"); + LOG(ERROR) << GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER + << ": low bit must be " << (t->next_stream_id & 1) << " on " + << (is_client ? "client" : "server"); } else { t->next_stream_id = static_cast(initial_sequence_number); } @@ -458,15 +483,11 @@ static void read_channel_args(grpc_chttp2_transport* t, if (t->is_client) { t->keepalive_permit_without_calls = channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) - .value_or(grpc_core::IsKeepaliveFixEnabled() - ? g_default_client_keepalive_permit_without_calls - : false); + .value_or(g_default_client_keepalive_permit_without_calls); } else { t->keepalive_permit_without_calls = channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) - .value_or(grpc_core::IsKeepaliveServerFixEnabled() - ? g_default_server_keepalive_permit_without_calls - : false); + .value_or(g_default_server_keepalive_permit_without_calls); } t->settings_timeout = @@ -495,7 +516,7 @@ static void read_channel_args(grpc_chttp2_transport* t, .value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) { t->channelz_socket = grpc_core::MakeRefCounted( - std::string(grpc_endpoint_get_local_address(t->ep)), + std::string(grpc_endpoint_get_local_address(t->ep.get())), std::string(t->peer_string.as_string_view()), absl::StrCat(t->GetTransportName(), " ", t->peer_string.as_string_view()), @@ -525,11 +546,10 @@ static void read_channel_args(grpc_chttp2_transport* t, value = channel_args.GetInt(GRPC_ARG_MAX_CONCURRENT_STREAMS).value_or(-1); if (value >= 0) { t->settings.mutable_local().SetMaxConcurrentStreams(value); - t->max_concurrent_streams_policy.SetTarget(value); } } else if (channel_args.Contains(GRPC_ARG_MAX_CONCURRENT_STREAMS)) { - gpr_log(GPR_DEBUG, "%s is not available on clients", - GRPC_ARG_MAX_CONCURRENT_STREAMS); + VLOG(2) << GRPC_ARG_MAX_CONCURRENT_STREAMS + << " is not available on clients"; } value = channel_args.GetInt(GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER).value_or(-1); @@ -589,11 +609,11 @@ using grpc_event_engine::experimental::QueryExtension; using grpc_event_engine::experimental::TcpTraceExtension; grpc_chttp2_transport::grpc_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client) - : ep(ep), + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr endpoint, bool is_client) + : ep(std::move(endpoint)), peer_string( - grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep))), + grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep.get()))), memory_owner(channel_args.GetObject() ->memory_quota() ->CreateMemoryOwner()), @@ -617,10 +637,11 @@ grpc_chttp2_transport::grpc_chttp2_transport( context_list = new grpc_core::ContextList(); if (channel_args.GetBool(GRPC_ARG_TCP_TRACING_ENABLED).value_or(false) && - grpc_event_engine::experimental::grpc_is_event_engine_endpoint(ep)) { + grpc_event_engine::experimental::grpc_is_event_engine_endpoint( + ep.get())) { auto epte = QueryExtension( grpc_event_engine::experimental::grpc_get_wrapped_event_engine_endpoint( - ep)); + ep.get())); if (epte != nullptr) { epte->InitializeAndReturnTcpTracer(); } @@ -763,17 +784,16 @@ static void close_transport_locked(grpc_chttp2_transport* t, CHECK(t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE); if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::MutexLock lock(&t->ep_destroy_mu); - grpc_endpoint_destroy(t->ep); - t->ep = nullptr; + t->ep.reset(); } if (t->notify_on_receive_settings != nullptr) { if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::ExecCtx::Run(DEBUG_LOCATION, t->notify_on_receive_settings, @@ -820,7 +840,8 @@ grpc_chttp2_stream::grpc_chttp2_stream(grpc_chttp2_transport* t, return refcount; }()), arena(arena), - flow_control(&t->flow_control) { + flow_control(&t->flow_control), + call_tracer_wrapper(this) { t->streams_allocated.fetch_add(1, std::memory_order_relaxed); if (server_data) { id = static_cast(reinterpret_cast(server_data)); @@ -927,11 +948,11 @@ static const char* write_state_name(grpc_chttp2_write_state st) { static void set_write_state(grpc_chttp2_transport* t, grpc_chttp2_write_state st, const char* reason) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "W:%p %s [%s] state %s -> %s [%s]", t, - t->is_client ? "CLIENT" : "SERVER", - std::string(t->peer_string.as_string_view()).c_str(), - write_state_name(t->write_state), write_state_name(st), reason)); + GRPC_TRACE_LOG(http, INFO) + << "W:" << t << " " << (t->is_client ? "CLIENT" : "SERVER") << " [" + << t->peer_string.as_string_view() << "] state " + << write_state_name(t->write_state) << " -> " << write_state_name(st) + << " [" << reason << "]"; t->write_state = st; // If the state is being reset back to idle, it means a write was just // finished. Make sure all the run_after_write closures are scheduled. @@ -1003,6 +1024,7 @@ static const char* begin_writing_desc(bool partial) { static void write_action_begin_locked( grpc_core::RefCountedPtr t, grpc_error_handle /*error_ignored*/) { + GRPC_LATENT_SEE_INNER_SCOPE("write_action_begin_locked"); CHECK(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); grpc_chttp2_begin_write_result r; if (!t->closed_with_error.ok()) { @@ -1021,11 +1043,10 @@ static void write_action_begin_locked( // We had paused reading, because we had many induced frames (SETTINGS // ACK, PINGS ACK and RST_STREAMS) pending in t->qbuf. Now that we have // been able to flush qbuf, we can resume reading. - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "transport %p : Resuming reading after being paused due to too " - "many unwritten SETTINGS ACK, PINGS ACK and RST_STREAM frames", - t.get())); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t.get() + << " : Resuming reading after being paused due to too many unwritten " + "SETTINGS ACK, PINGS ACK and RST_STREAM frames"; t->reading_paused_on_pending_induced_frames = false; continue_read_action_locked(std::move(t)); } @@ -1061,7 +1082,7 @@ static void write_action(grpc_chttp2_transport* t) { << (t->is_client ? "CLIENT" : "SERVER") << "[" << t << "]: Write " << t->outbuf.Length() << " bytes"; t->write_size_policy.BeginWrite(t->outbuf.Length()); - grpc_endpoint_write(t->ep, t->outbuf.c_slice_buffer(), + grpc_endpoint_write(t->ep.get(), t->outbuf.c_slice_buffer(), grpc_core::InitTransportClosure( t->Ref(), &t->write_action_end_locked), cl, max_frame_size); @@ -1152,15 +1173,15 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, static_cast(goaway_error)), grpc_core::StatusIntProperty::kRpcStatus, GRPC_STATUS_UNAVAILABLE); - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "transport %p got goaway with last stream id %d", t, - last_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t << " got goaway with last stream id " + << last_stream_id; // We want to log this irrespective of whether http tracing is enabled if we // received a GOAWAY with a non NO_ERROR code. if (goaway_error != GRPC_HTTP2_NO_ERROR) { - gpr_log(GPR_INFO, "%s: Got goaway [%d] err=%s", - std::string(t->peer_string.as_string_view()).c_str(), goaway_error, - grpc_core::StatusToString(t->goaway_error).c_str()); + LOG(INFO) << t->peer_string.as_string_view() << ": Got goaway [" + << goaway_error + << "] err=" << grpc_core::StatusToString(t->goaway_error); } if (t->is_client) { cancel_unstarted_streams(t, t->goaway_error, false); @@ -1186,12 +1207,11 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, if (GPR_UNLIKELY(t->is_client && goaway_error == GRPC_HTTP2_ENHANCE_YOUR_CALM && goaway_text == "too_many_pings")) { - gpr_log(GPR_ERROR, - "%s: Received a GOAWAY with error code ENHANCE_YOUR_CALM and debug " - "data equal to \"too_many_pings\". Current keepalive time (before " - "throttling): %s", - std::string(t->peer_string.as_string_view()).c_str(), - t->keepalive_time.ToString().c_str()); + LOG(ERROR) << t->peer_string.as_string_view() + << ": Received a GOAWAY with error code ENHANCE_YOUR_CALM and " + "debug data equal to \"too_many_pings\". Current keepalive " + "time (before throttling): " + << t->keepalive_time.ToString(); constexpr int max_keepalive_time_millis = INT_MAX / KEEPALIVE_TIME_BACKOFF_MULTIPLIER; int64_t throttled_keepalive_time = @@ -1223,10 +1243,10 @@ static void maybe_start_some_streams(grpc_chttp2_transport* t) { t->stream_map.size() < t->settings.peer().max_concurrent_streams() && grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) { // safe since we can't (legally) be parsing this stream yet - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "HTTP:%s: Transport %p allocating new grpc_chttp2_stream %p to id %d", - t->is_client ? "CLI" : "SVR", t, s, t->next_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "HTTP:" << (t->is_client ? "CLI" : "SVR") << ": Transport " << t + << " allocating new grpc_chttp2_stream " << s << " to id " + << t->next_stream_id; CHECK_EQ(s->id, 0u); s->id = t->next_stream_id; @@ -1288,19 +1308,14 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, return; } closure->next_data.scratch -= CLOSURE_BARRIER_FIRST_REF_BIT; - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log( - GPR_INFO, - "complete_closure_step: t=%p %p refs=%d flags=0x%04x desc=%s err=%s " - "write_state=%s whence=%s:%d", - t, closure, - static_cast(closure->next_data.scratch / - CLOSURE_BARRIER_FIRST_REF_BIT), - static_cast(closure->next_data.scratch % - CLOSURE_BARRIER_FIRST_REF_BIT), - desc, grpc_core::StatusToString(error).c_str(), - write_state_name(t->write_state), whence.file(), whence.line()); - } + GRPC_TRACE_LOG(http, INFO) + << "complete_closure_step: t=" << t << " " << closure << " refs=" + << (closure->next_data.scratch / CLOSURE_BARRIER_FIRST_REF_BIT) + << " flags=" + << (closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT) + << " desc=" << desc << " err=" << grpc_core::StatusToString(error) + << " write_state=" << write_state_name(t->write_state) + << " whence=" << whence.file() << ":" << whence.line(); if (!error.ok()) { grpc_error_handle cl_err = @@ -1342,10 +1357,245 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, const std::string prefix = absl::StrCat( "HTTP:", id, is_initial ? ":HDR" : ":TRL", is_client ? ":CLI:" : ":SVR:"); md_batch->Log([&prefix](absl::string_view key, absl::string_view value) { - VLOG(2) << absl::StrCat(prefix, key, ": ", value); + VLOG(2) << prefix << key << ": " << value; }); } +static void send_initial_metadata_locked( + grpc_transport_stream_op_batch* op, grpc_chttp2_stream* s, + grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t, grpc_closure* on_complete) { + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s->call_tracer != nullptr) { + s->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s->t->flow_control.stats()) + .Add(s->flow_control.stats())); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = s->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s->t->flow_control.stats()) + .Add(s->flow_control.stats())); + } + } + if (t->is_client && t->channelz_socket != nullptr) { + t->channelz_socket->RecordStreamStartedFromLocal(); + } + CHECK_EQ(s->send_initial_metadata_finished, nullptr); + on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; + + s->send_initial_metadata_finished = add_closure_barrier(on_complete); + s->send_initial_metadata = + op_payload->send_initial_metadata.send_initial_metadata; + if (t->is_client) { + s->deadline = + std::min(s->deadline, + s->send_initial_metadata->get(grpc_core::GrpcTimeoutMetadata()) + .value_or(grpc_core::Timestamp::InfFuture())); + } + if (contains_non_ok_status(s->send_initial_metadata)) { + s->seen_error = true; + } + if (!s->write_closed) { + if (t->is_client) { + if (t->closed_with_error.ok()) { + CHECK_EQ(s->id, 0u); + grpc_chttp2_list_add_waiting_for_concurrency(t, s); + maybe_start_some_streams(t); + } else { + s->trailing_metadata_buffer.Set( + grpc_core::GrpcStreamNetworkState(), + grpc_core::GrpcStreamNetworkState::kNotSentOnWire); + grpc_chttp2_cancel_stream( + t, s, + grpc_error_set_int( + GRPC_ERROR_CREATE_REFERENCING("Transport closed", + &t->closed_with_error, 1), + grpc_core::StatusIntProperty::kRpcStatus, + GRPC_STATUS_UNAVAILABLE), + false); + } + } else { + CHECK_NE(s->id, 0u); + grpc_chttp2_mark_stream_writable(t, s); + if (!(op->send_message && + (op->payload->send_message.flags & GRPC_WRITE_BUFFER_HINT))) { + grpc_chttp2_initiate_write( + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); + } + } + } else { + s->send_initial_metadata = nullptr; + grpc_chttp2_complete_closure_step( + t, &s->send_initial_metadata_finished, + GRPC_ERROR_CREATE_REFERENCING( + "Attempt to send initial metadata after stream was closed", + &s->write_closed_error, 1), + "send_initial_metadata_finished"); + } +} + +static void send_message_locked( + grpc_transport_stream_op_batch* op, grpc_chttp2_stream* s, + grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t, grpc_closure* on_complete) { + t->num_messages_in_next_write++; + grpc_core::global_stats().IncrementHttp2SendMessageSize( + op->payload->send_message.send_message->Length()); + on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; + s->send_message_finished = add_closure_barrier(op->on_complete); + const uint32_t flags = op_payload->send_message.flags; + if (s->write_closed) { + op->payload->send_message.stream_write_closed = true; + // We should NOT return an error here, so as to avoid a cancel OP being + // started. The surface layer will notice that the stream has been closed + // for writes and fail the send message op. + grpc_chttp2_complete_closure_step(t, &s->send_message_finished, + absl::OkStatus(), + "fetching_send_message_finished"); + } else { + uint8_t* frame_hdr = grpc_slice_buffer_tiny_add(&s->flow_controlled_buffer, + GRPC_HEADER_SIZE_IN_BYTES); + frame_hdr[0] = (flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; + size_t len = op_payload->send_message.send_message->Length(); + frame_hdr[1] = static_cast(len >> 24); + frame_hdr[2] = static_cast(len >> 16); + frame_hdr[3] = static_cast(len >> 8); + frame_hdr[4] = static_cast(len); + + s->call_tracer_wrapper.RecordOutgoingBytes( + {GRPC_HEADER_SIZE_IN_BYTES, len, 0}); + s->next_message_end_offset = + s->flow_controlled_bytes_written + + static_cast(s->flow_controlled_buffer.length) + + static_cast(len); + if (flags & GRPC_WRITE_BUFFER_HINT) { + s->next_message_end_offset -= t->write_buffer_size; + s->write_buffering = true; + } else { + s->write_buffering = false; + } + + grpc_slice* const slices = + op_payload->send_message.send_message->c_slice_buffer()->slices; + grpc_slice* const end = + slices + op_payload->send_message.send_message->Count(); + for (grpc_slice* slice = slices; slice != end; slice++) { + grpc_slice_buffer_add(&s->flow_controlled_buffer, + grpc_core::CSliceRef(*slice)); + } + + int64_t notify_offset = s->next_message_end_offset; + if (notify_offset <= s->flow_controlled_bytes_written) { + grpc_chttp2_complete_closure_step(t, &s->send_message_finished, + absl::OkStatus(), + "fetching_send_message_finished"); + } else { + grpc_chttp2_write_cb* cb = t->write_cb_pool; + if (cb == nullptr) { + cb = static_cast(gpr_malloc(sizeof(*cb))); + } else { + t->write_cb_pool = cb->next; + } + cb->call_at_byte = notify_offset; + cb->closure = s->send_message_finished; + s->send_message_finished = nullptr; + grpc_chttp2_write_cb** list = flags & GRPC_WRITE_THROUGH + ? &s->on_write_finished_cbs + : &s->on_flow_controlled_cbs; + cb->next = *list; + *list = cb; + } + + if (s->id != 0 && (!s->write_buffering || s->flow_controlled_buffer.length > + t->write_buffer_size)) { + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); + } + } +} + +static void send_trailing_metadata_locked( + grpc_transport_stream_op_batch* op, grpc_chttp2_stream* s, + grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t, grpc_closure* on_complete) { + CHECK_EQ(s->send_trailing_metadata_finished, nullptr); + on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; + s->send_trailing_metadata_finished = add_closure_barrier(on_complete); + s->send_trailing_metadata = + op_payload->send_trailing_metadata.send_trailing_metadata; + s->sent_trailing_metadata_op = op_payload->send_trailing_metadata.sent; + s->write_buffering = false; + if (contains_non_ok_status(s->send_trailing_metadata)) { + s->seen_error = true; + } + if (s->write_closed) { + s->send_trailing_metadata = nullptr; + s->sent_trailing_metadata_op = nullptr; + grpc_chttp2_complete_closure_step( + t, &s->send_trailing_metadata_finished, + op->payload->send_trailing_metadata.send_trailing_metadata->empty() + ? absl::OkStatus() + : GRPC_ERROR_CREATE("Attempt to send trailing metadata after " + "stream was closed"), + "send_trailing_metadata_finished"); + } else if (s->id != 0) { + // TODO(ctiller): check if there's flow control for any outstanding + // bytes before going writable + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write( + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); + } +} + +static void recv_initial_metadata_locked( + grpc_chttp2_stream* s, grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t) { + CHECK_EQ(s->recv_initial_metadata_ready, nullptr); + s->recv_initial_metadata_ready = + op_payload->recv_initial_metadata.recv_initial_metadata_ready; + s->recv_initial_metadata = + op_payload->recv_initial_metadata.recv_initial_metadata; + s->trailing_metadata_available = + op_payload->recv_initial_metadata.trailing_metadata_available; + if (s->parsed_trailers_only && s->trailing_metadata_available != nullptr) { + *s->trailing_metadata_available = true; + } + grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); +} + +static void recv_message_locked( + grpc_chttp2_stream* s, grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t) { + CHECK_EQ(s->recv_message_ready, nullptr); + s->recv_message_ready = op_payload->recv_message.recv_message_ready; + s->recv_message = op_payload->recv_message.recv_message; + s->recv_message->emplace(); + s->recv_message_flags = op_payload->recv_message.flags; + s->call_failed_before_recv_message = + op_payload->recv_message.call_failed_before_recv_message; + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); +} + +static void recv_trailing_metadata_locked( + grpc_chttp2_stream* s, grpc_transport_stream_op_batch_payload* op_payload, + grpc_chttp2_transport* t) { + CHECK_EQ(s->collecting_stats, nullptr); + s->collecting_stats = op_payload->recv_trailing_metadata.collect_stats; + CHECK_EQ(s->recv_trailing_metadata_finished, nullptr); + s->recv_trailing_metadata_finished = + op_payload->recv_trailing_metadata.recv_trailing_metadata_ready; + s->recv_trailing_metadata = + op_payload->recv_trailing_metadata.recv_trailing_metadata; + s->final_metadata_requested = true; + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); +} + static void perform_stream_op_locked(void* stream_op, grpc_error_handle /*error_ignored*/) { grpc_transport_stream_op_batch* op = @@ -1356,13 +1606,14 @@ static void perform_stream_op_locked(void* stream_op, grpc_chttp2_transport* t = s->t.get(); s->traced = op->is_traced; - s->call_tracer = CallTracerIfSampled(s); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + s->call_tracer = CallTracerIfSampled(s); + } s->tcp_tracer = TcpTracerIfSampled(s); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, - "perform_stream_op_locked[s=%p; op=%p]: %s; on_complete = %p", s, - op, grpc_transport_stream_op_batch_string(op, false).c_str(), - op->on_complete); + LOG(INFO) << "perform_stream_op_locked[s=" << s << "; op=" << op + << "]: " << grpc_transport_stream_op_batch_string(op, false) + << "; on_complete = " << op->on_complete; if (op->send_initial_metadata) { log_metadata(op_payload->send_initial_metadata.send_initial_metadata, s->id, t->is_client, true); @@ -1388,216 +1639,27 @@ static void perform_stream_op_locked(void* stream_op, } if (op->send_initial_metadata) { - if (s->call_tracer != nullptr) { - s->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s->t->flow_control.stats()) - .Add(s->flow_control.stats())); - } - if (t->is_client && t->channelz_socket != nullptr) { - t->channelz_socket->RecordStreamStartedFromLocal(); - } - CHECK_EQ(s->send_initial_metadata_finished, nullptr); - on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; - - s->send_initial_metadata_finished = add_closure_barrier(on_complete); - s->send_initial_metadata = - op_payload->send_initial_metadata.send_initial_metadata; - if (t->is_client) { - s->deadline = std::min( - s->deadline, - s->send_initial_metadata->get(grpc_core::GrpcTimeoutMetadata()) - .value_or(grpc_core::Timestamp::InfFuture())); - } - if (contains_non_ok_status(s->send_initial_metadata)) { - s->seen_error = true; - } - if (!s->write_closed) { - if (t->is_client) { - if (t->closed_with_error.ok()) { - CHECK_EQ(s->id, 0u); - grpc_chttp2_list_add_waiting_for_concurrency(t, s); - maybe_start_some_streams(t); - } else { - s->trailing_metadata_buffer.Set( - grpc_core::GrpcStreamNetworkState(), - grpc_core::GrpcStreamNetworkState::kNotSentOnWire); - grpc_chttp2_cancel_stream( - t, s, - grpc_error_set_int( - GRPC_ERROR_CREATE_REFERENCING("Transport closed", - &t->closed_with_error, 1), - grpc_core::StatusIntProperty::kRpcStatus, - GRPC_STATUS_UNAVAILABLE), - false); - } - } else { - CHECK_NE(s->id, 0u); - grpc_chttp2_mark_stream_writable(t, s); - if (!(op->send_message && - (op->payload->send_message.flags & GRPC_WRITE_BUFFER_HINT))) { - grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); - } - } - } else { - s->send_initial_metadata = nullptr; - grpc_chttp2_complete_closure_step( - t, &s->send_initial_metadata_finished, - GRPC_ERROR_CREATE_REFERENCING( - "Attempt to send initial metadata after stream was closed", - &s->write_closed_error, 1), - "send_initial_metadata_finished"); - } + send_initial_metadata_locked(op, s, op_payload, t, on_complete); } if (op->send_message) { - t->num_messages_in_next_write++; - grpc_core::global_stats().IncrementHttp2SendMessageSize( - op->payload->send_message.send_message->Length()); - on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; - s->send_message_finished = add_closure_barrier(op->on_complete); - const uint32_t flags = op_payload->send_message.flags; - if (s->write_closed) { - op->payload->send_message.stream_write_closed = true; - // We should NOT return an error here, so as to avoid a cancel OP being - // started. The surface layer will notice that the stream has been closed - // for writes and fail the send message op. - grpc_chttp2_complete_closure_step(t, &s->send_message_finished, - absl::OkStatus(), - "fetching_send_message_finished"); - } else { - uint8_t* frame_hdr = grpc_slice_buffer_tiny_add( - &s->flow_controlled_buffer, GRPC_HEADER_SIZE_IN_BYTES); - frame_hdr[0] = (flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; - size_t len = op_payload->send_message.send_message->Length(); - frame_hdr[1] = static_cast(len >> 24); - frame_hdr[2] = static_cast(len >> 16); - frame_hdr[3] = static_cast(len >> 8); - frame_hdr[4] = static_cast(len); - - if (grpc_core::IsHttp2StatsFixEnabled()) { - s->stats.outgoing.framing_bytes += GRPC_HEADER_SIZE_IN_BYTES; - s->stats.outgoing.data_bytes += - op_payload->send_message.send_message->Length(); - } - s->next_message_end_offset = - s->flow_controlled_bytes_written + - static_cast(s->flow_controlled_buffer.length) + - static_cast(len); - if (flags & GRPC_WRITE_BUFFER_HINT) { - s->next_message_end_offset -= t->write_buffer_size; - s->write_buffering = true; - } else { - s->write_buffering = false; - } - - grpc_slice* const slices = - op_payload->send_message.send_message->c_slice_buffer()->slices; - grpc_slice* const end = - slices + op_payload->send_message.send_message->Count(); - for (grpc_slice* slice = slices; slice != end; slice++) { - grpc_slice_buffer_add(&s->flow_controlled_buffer, - grpc_core::CSliceRef(*slice)); - } - - int64_t notify_offset = s->next_message_end_offset; - if (notify_offset <= s->flow_controlled_bytes_written) { - grpc_chttp2_complete_closure_step(t, &s->send_message_finished, - absl::OkStatus(), - "fetching_send_message_finished"); - } else { - grpc_chttp2_write_cb* cb = t->write_cb_pool; - if (cb == nullptr) { - cb = static_cast(gpr_malloc(sizeof(*cb))); - } else { - t->write_cb_pool = cb->next; - } - cb->call_at_byte = notify_offset; - cb->closure = s->send_message_finished; - s->send_message_finished = nullptr; - grpc_chttp2_write_cb** list = flags & GRPC_WRITE_THROUGH - ? &s->on_write_finished_cbs - : &s->on_flow_controlled_cbs; - cb->next = *list; - *list = cb; - } - - if (s->id != 0 && - (!s->write_buffering || - s->flow_controlled_buffer.length > t->write_buffer_size)) { - grpc_chttp2_mark_stream_writable(t, s); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); - } - } + send_message_locked(op, s, op_payload, t, on_complete); } if (op->send_trailing_metadata) { - CHECK_EQ(s->send_trailing_metadata_finished, nullptr); - on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; - s->send_trailing_metadata_finished = add_closure_barrier(on_complete); - s->send_trailing_metadata = - op_payload->send_trailing_metadata.send_trailing_metadata; - s->sent_trailing_metadata_op = op_payload->send_trailing_metadata.sent; - s->write_buffering = false; - if (contains_non_ok_status(s->send_trailing_metadata)) { - s->seen_error = true; - } - if (s->write_closed) { - s->send_trailing_metadata = nullptr; - s->sent_trailing_metadata_op = nullptr; - grpc_chttp2_complete_closure_step( - t, &s->send_trailing_metadata_finished, - op->payload->send_trailing_metadata.send_trailing_metadata->empty() - ? absl::OkStatus() - : GRPC_ERROR_CREATE("Attempt to send trailing metadata after " - "stream was closed"), - "send_trailing_metadata_finished"); - } else if (s->id != 0) { - // TODO(ctiller): check if there's flow control for any outstanding - // bytes before going writable - grpc_chttp2_mark_stream_writable(t, s); - grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); - } + send_trailing_metadata_locked(op, s, op_payload, t, on_complete); } if (op->recv_initial_metadata) { - CHECK_EQ(s->recv_initial_metadata_ready, nullptr); - s->recv_initial_metadata_ready = - op_payload->recv_initial_metadata.recv_initial_metadata_ready; - s->recv_initial_metadata = - op_payload->recv_initial_metadata.recv_initial_metadata; - s->trailing_metadata_available = - op_payload->recv_initial_metadata.trailing_metadata_available; - if (s->parsed_trailers_only && s->trailing_metadata_available != nullptr) { - *s->trailing_metadata_available = true; - } - grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); + recv_initial_metadata_locked(s, op_payload, t); } if (op->recv_message) { - CHECK_EQ(s->recv_message_ready, nullptr); - s->recv_message_ready = op_payload->recv_message.recv_message_ready; - s->recv_message = op_payload->recv_message.recv_message; - s->recv_message->emplace(); - s->recv_message_flags = op_payload->recv_message.flags; - s->call_failed_before_recv_message = - op_payload->recv_message.call_failed_before_recv_message; - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + recv_message_locked(s, op_payload, t); } if (op->recv_trailing_metadata) { - CHECK_EQ(s->collecting_stats, nullptr); - s->collecting_stats = op_payload->recv_trailing_metadata.collect_stats; - CHECK_EQ(s->recv_trailing_metadata_finished, nullptr); - s->recv_trailing_metadata_finished = - op_payload->recv_trailing_metadata.recv_trailing_metadata_ready; - s->recv_trailing_metadata = - op_payload->recv_trailing_metadata.recv_trailing_metadata; - s->final_metadata_requested = true; - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + recv_trailing_metadata_locked(s, op_payload, t); } if (on_complete != nullptr) { @@ -1625,10 +1687,9 @@ void grpc_chttp2_transport::PerformStreamOp( } } - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "perform_stream_op[s=%p; op=%p]: %s", s, op, - grpc_transport_stream_op_batch_string(op, false).c_str()); - } + GRPC_TRACE_LOG(http, INFO) + << "perform_stream_op[s=" << s << "; op=" << op + << "]: " << grpc_transport_stream_op_batch_string(op, false); GRPC_CHTTP2_STREAM_REF(s, "perform_stream_op"); op->handler_private.extra_arg = gs; @@ -1638,8 +1699,8 @@ void grpc_chttp2_transport::PerformStreamOp( } static void cancel_pings(grpc_chttp2_transport* t, grpc_error_handle error) { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "%p CANCEL PINGS: %s", t, - grpc_core::StatusToString(error).c_str())); + GRPC_TRACE_LOG(http, INFO) + << t << " CANCEL PINGS: " << grpc_core::StatusToString(error); // callback remaining pings: they're not allowed to call into the transport, // and maybe they hold resources that need to be freed t->ping_callbacks.CancelAll(t->event_engine.get()); @@ -1722,8 +1783,8 @@ static void retry_initiate_ping_locked( void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { if (!t->ping_callbacks.AckPing(id, t->event_engine.get())) { - gpr_log(GPR_DEBUG, "Unknown ping response from %s: %" PRIx64, - std::string(t->peer_string.as_string_view()).c_str(), id); + VLOG(2) << "Unknown ping response from " << t->peer_string.as_string_view() + << ": " << id; return; } if (t->ping_callbacks.ping_requested()) { @@ -1828,22 +1889,21 @@ class GracefulGoaway : public grpc_core::RefCounted { return; } if (t_->destroying || !t_->closed_with_error.ok()) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport:%p %s peer:%s Transport already shutting down. " - "Graceful GOAWAY abandoned.", - t_.get(), t_->is_client ? "CLIENT" : "SERVER", - std::string(t_->peer_string.as_string_view()).c_str())); + GRPC_TRACE_LOG(http, INFO) << "transport:" << t_.get() << " " + << (t_->is_client ? "CLIENT" : "SERVER") + << " peer:" << t_->peer_string.as_string_view() + << " Transport already shutting down. " + "Graceful GOAWAY abandoned."; return; } // Ping completed. Send final goaway. - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport:%p %s peer:%s Graceful shutdown: Ping received. " - "Sending final GOAWAY with stream_id:%d", - t_.get(), t_->is_client ? "CLIENT" : "SERVER", - std::string(t_->peer_string.as_string_view()).c_str(), - t_->last_new_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "transport:" << t_.get() << " " + << (t_->is_client ? "CLIENT" : "SERVER") + << " peer:" << std::string(t_->peer_string.as_string_view()) + << " Graceful shutdown: Ping received. " + "Sending final GOAWAY with stream_id:" + << t_->last_new_stream_id; t_->sent_goaway_state = GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED; grpc_chttp2_goaway_append(t_->last_new_stream_id, 0, grpc_empty_slice(), &t_->qbuf); @@ -1887,10 +1947,10 @@ static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error, } else if (t->sent_goaway_state == GRPC_CHTTP2_NO_GOAWAY_SEND || t->sent_goaway_state == GRPC_CHTTP2_GRACEFUL_GOAWAY) { // We want to log this irrespective of whether http tracing is enabled - gpr_log(GPR_DEBUG, "%s %s: Sending goaway last_new_stream_id=%d err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - t->is_client ? "CLIENT" : "SERVER", t->last_new_stream_id, - grpc_core::StatusToString(error).c_str()); + VLOG(2) << t->peer_string.as_string_view() << " " + << (t->is_client ? "CLIENT" : "SERVER") + << ": Sending goaway last_new_stream_id=" << t->last_new_stream_id + << " err=" << grpc_core::StatusToString(error); t->sent_goaway_state = GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED; grpc_chttp2_goaway_append( t->last_new_stream_id, static_cast(http_error), @@ -1938,11 +1998,15 @@ static void perform_transport_op_locked(void* stream_op, } if (op->bind_pollset) { - grpc_endpoint_add_to_pollset(t->ep, op->bind_pollset); + if (t->ep != nullptr) { + grpc_endpoint_add_to_pollset(t->ep.get(), op->bind_pollset); + } } if (op->bind_pollset_set) { - grpc_endpoint_add_to_pollset_set(t->ep, op->bind_pollset_set); + if (t->ep != nullptr) { + grpc_endpoint_add_to_pollset_set(t->ep.get(), op->bind_pollset_set); + } } if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { @@ -1969,10 +2033,8 @@ static void perform_transport_op_locked(void* stream_op, } void grpc_chttp2_transport::PerformOp(grpc_transport_op* op) { - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "perform_transport_op[t=%p]: %s", this, - grpc_transport_op_string(op).c_str()); - } + GRPC_TRACE_LOG(http, INFO) << "perform_transport_op[t=" << this + << "]: " << grpc_transport_op_string(op); op->handler_private.extra_arg = this; Ref().release()->combiner->Run( GRPC_CLOSURE_INIT(&op->handler_private.closure, @@ -2022,12 +2084,10 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, // Lambda is immediately invoked as a big scoped section that can be // exited out of at any point by returning. [&]() { - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, - "maybe_complete_recv_message %p final_metadata_requested=%d " - "seen_error=%d", - s, s->final_metadata_requested, s->seen_error); - } + GRPC_TRACE_VLOG(http, 2) + << "maybe_complete_recv_message " << s + << " final_metadata_requested=" << s->final_metadata_requested + << " seen_error=" << s->seen_error; if (s->final_metadata_requested && s->seen_error) { grpc_slice_buffer_reset_and_unref(&s->frame_storage); s->recv_message->reset(); @@ -2038,12 +2098,10 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, int64_t min_progress_size; auto r = grpc_deframe_unprocessed_incoming_frames( s, &min_progress_size, &**s->recv_message, s->recv_message_flags); - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, "Deframe data frame: %s", - grpc_core::PollToString(r, [](absl::Status r) { - return r.ToString(); - }).c_str()); - } + GRPC_TRACE_VLOG(http, 2) + << "Deframe data frame: " + << grpc_core::PollToString( + r, [](absl::Status r) { return r.ToString(); }); if (r.pending()) { if (s->read_closed) { grpc_slice_buffer_reset_and_unref(&s->frame_storage); @@ -2094,14 +2152,12 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { grpc_chttp2_maybe_complete_recv_message(t, s); - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, - "maybe_complete_recv_trailing_metadata cli=%d s=%p closure=%p " - "read_closed=%d " - "write_closed=%d %" PRIdPTR, - t->is_client, s, s->recv_trailing_metadata_finished, s->read_closed, - s->write_closed, s->frame_storage.length); - } + GRPC_TRACE_VLOG(http, 2) << "maybe_complete_recv_trailing_metadata cli=" + << t->is_client << " s=" << s + << " closure=" << s->recv_trailing_metadata_finished + << " read_closed=" << s->read_closed + << " write_closed=" << s->write_closed << " " + << s->frame_storage.length; if (s->recv_trailing_metadata_finished != nullptr && s->read_closed && s->write_closed) { if (s->seen_error || !t->is_client) { @@ -2305,14 +2361,12 @@ grpc_chttp2_transport::RemovedStreamHandle grpc_chttp2_mark_stream_closed( grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, int close_writes, grpc_error_handle error) { grpc_chttp2_transport::RemovedStreamHandle rsh; - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log( - GPR_DEBUG, "MARK_STREAM_CLOSED: t=%p s=%p(id=%d) %s [%s]", t, s, s->id, - (close_reads && close_writes) - ? "read+write" - : (close_reads ? "read" : (close_writes ? "write" : "nothing??")), - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_VLOG(http, 2) + << "MARK_STREAM_CLOSED: t=" << t << " s=" << s << "(id=" << s->id << ") " + << ((close_reads && close_writes) + ? "read+write" + : (close_reads ? "read" : (close_writes ? "write" : "nothing??"))) + << " [" << grpc_core::StatusToString(error) << "]"; if (s->read_closed && s->write_closed) { // already closed, but we should still fake the status if needed. grpc_error_handle overall_error = removal_error(error, s, "Stream removed"); @@ -2648,6 +2702,7 @@ static void read_action(grpc_core::RefCountedPtr t, static void read_action_parse_loop_locked( grpc_core::RefCountedPtr t, grpc_error_handle error) { + GRPC_LATENT_SEE_INNER_SCOPE("read_action_parse_loop_locked"); if (t->closed_with_error.ok()) { grpc_error_handle errors[3] = {error, absl::OkStatus(), absl::OkStatus()}; size_t requests_started = 0; @@ -2719,11 +2774,10 @@ static void read_action_parse_loop_locked( if (keep_reading) { if (t->num_pending_induced_frames >= DEFAULT_MAX_PENDING_INDUCED_FRAMES) { t->reading_paused_on_pending_induced_frames = true; - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport %p : Pausing reading due to too " - "many unwritten SETTINGS ACK and RST_STREAM frames", - t.get())); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t.get() + << " : Pausing reading due to too many unwritten " + "SETTINGS ACK and RST_STREAM frames"; } else { continue_read_action_locked(std::move(t)); } @@ -2738,9 +2792,8 @@ static void read_action_locked( if (t->keepalive_ping_timeout_handle != TaskHandle::kInvalid) { if (GRPC_TRACE_FLAG_ENABLED(http2_ping) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, - "%s[%p]: Clear keepalive timer because data was received", - t->is_client ? "CLIENT" : "SERVER", t.get()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t.get() + << "]: Clear keepalive timer because data was received"; } t->event_engine->Cancel( std::exchange(t->keepalive_ping_timeout_handle, TaskHandle::kInvalid)); @@ -2759,7 +2812,7 @@ static void continue_read_action_locked( grpc_core::RefCountedPtr t) { const bool urgent = !t->goaway_error.ok(); auto* tp = t.get(); - grpc_endpoint_read(tp->ep, &tp->read_buffer, + grpc_endpoint_read(tp->ep.get(), &tp->read_buffer, grpc_core::InitTransportClosure( std::move(t), &tp->read_action_locked), urgent, grpc_chttp2_min_read_progress_size(tp)); @@ -2790,11 +2843,9 @@ static void start_bdp_ping(grpc_core::RefCountedPtr t, static void start_bdp_ping_locked( grpc_core::RefCountedPtr t, grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "%s: Start BDP ping err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(http, INFO) + << t->peer_string.as_string_view() + << ": Start BDP ping err=" << grpc_core::StatusToString(error); if (!error.ok() || !t->closed_with_error.ok()) { return; } @@ -2817,11 +2868,9 @@ static void finish_bdp_ping(grpc_core::RefCountedPtr t, static void finish_bdp_ping_locked( grpc_core::RefCountedPtr t, grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "%s: Complete BDP ping err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(http, INFO) + << t->peer_string.as_string_view() + << ": Complete BDP ping err=" << grpc_core::StatusToString(error); if (!error.ok() || !t->closed_with_error.ok()) { return; } @@ -2963,8 +3012,8 @@ static void finish_keepalive_ping_locked( if (error.ok()) { if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s: Finish keepalive ping", - std::string(t->peer_string.as_string_view()).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Finish keepalive ping"; } t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; CHECK(t->keepalive_ping_timer_handle == TaskHandle::kInvalid); @@ -2985,8 +3034,8 @@ static void maybe_reset_keepalive_ping_timer_locked(grpc_chttp2_transport* t) { // need to Ref or Unref here since we still hold the Ref. if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s: Keepalive ping cancelled. Resetting timer.", - std::string(t->peer_string.as_string_view()).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Keepalive ping cancelled. Resetting timer."; } t->keepalive_ping_timer_handle = t->event_engine->RunAfter(t->keepalive_time, [t = t->Ref()]() mutable { @@ -3005,9 +3054,9 @@ static void connectivity_state_set(grpc_chttp2_transport* t, grpc_connectivity_state state, const absl::Status& status, const char* reason) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, "transport %p set connectivity_state=%d; status=%s; reason=%s", - t, state, status.ToString().c_str(), reason)); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t << " set connectivity_state=" << state + << "; status=" << status.ToString() << "; reason=" << reason; t->state_tracker.SetState(state, status, reason); } @@ -3022,7 +3071,7 @@ void grpc_chttp2_transport::SetPollset(grpc_stream* /*gs*/, // actually uses pollsets. if (strcmp(grpc_get_poll_strategy_name(), "poll") != 0) return; grpc_core::MutexLock lock(&ep_destroy_mu); - if (ep != nullptr) grpc_endpoint_add_to_pollset(ep, pollset); + if (ep != nullptr) grpc_endpoint_add_to_pollset(ep.get(), pollset); } void grpc_chttp2_transport::SetPollsetSet(grpc_stream* /*gs*/, @@ -3032,7 +3081,7 @@ void grpc_chttp2_transport::SetPollsetSet(grpc_stream* /*gs*/, // actually uses pollsets. if (strcmp(grpc_get_poll_strategy_name(), "poll") != 0) return; grpc_core::MutexLock lock(&ep_destroy_mu); - if (ep != nullptr) grpc_endpoint_add_to_pollset_set(ep, pollset_set); + if (ep != nullptr) grpc_endpoint_add_to_pollset_set(ep.get(), pollset_set); } // @@ -3083,21 +3132,18 @@ static void benign_reclaimer_locked( if (error.ok() && t->stream_map.empty()) { // Channel with no active streams: send a goaway to try and make it // disconnect cleanly - if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, "HTTP2: %s - send goaway to free memory", - std::string(t->peer_string.as_string_view()).c_str()); - } + GRPC_TRACE_LOG(resource_quota, INFO) + << "HTTP2: " << t->peer_string.as_string_view() + << " - send goaway to free memory"; send_goaway(t.get(), grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"), grpc_core::StatusIntProperty::kHttp2Error, GRPC_HTTP2_ENHANCE_YOUR_CALM), /*immediate_disconnect_hint=*/true); } else if (error.ok() && GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, - "HTTP2: %s - skip benign reclamation, there are still %" PRIdPTR - " streams", - std::string(t->peer_string.as_string_view()).c_str(), - t->stream_map.size()); + LOG(INFO) << "HTTP2: " << t->peer_string.as_string_view() + << " - skip benign reclamation, there are still " + << t->stream_map.size() << " streams"; } t->benign_reclaimer_registered = false; if (error != absl::CancelledError()) { @@ -3112,10 +3158,9 @@ static void destructive_reclaimer_locked( if (error.ok() && !t->stream_map.empty()) { // As stream_map is a hash map, this selects effectively a random stream. grpc_chttp2_stream* s = t->stream_map.begin()->second; - if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, "HTTP2: %s - abandon stream id %d", - std::string(t->peer_string.as_string_view()).c_str(), s->id); - } + GRPC_TRACE_LOG(resource_quota, INFO) + << "HTTP2: " << t->peer_string.as_string_view() + << " - abandon stream id " << s->id; grpc_chttp2_cancel_stream( t.get(), s, grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"), @@ -3211,9 +3256,9 @@ grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport) { } grpc_core::Transport* grpc_create_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client) { - return new grpc_chttp2_transport(channel_args, ep, is_client); + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr ep, bool is_client) { + return new grpc_chttp2_transport(channel_args, std::move(ep), is_client); } void grpc_chttp2_transport_start_reading( @@ -3224,7 +3269,6 @@ void grpc_chttp2_transport_start_reading( auto t = reinterpret_cast(transport)->Ref(); if (read_buffer != nullptr) { grpc_slice_buffer_move_into(read_buffer, &t->read_buffer); - gpr_free(read_buffer); } auto* tp = t.get(); tp->combiner->Run( @@ -3236,7 +3280,7 @@ void grpc_chttp2_transport_start_reading( if (t->ep != nullptr && interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, interested_parties_until_recv_settings); + t->ep.get(), interested_parties_until_recv_settings); } grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify_on_receive_settings, t->closed_with_error); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 1bcb8a9ae1..d2b9329803 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -44,8 +44,8 @@ /// from the caller; if the caller still needs the resource_user after creating /// a transport, the caller must take another ref. grpc_core::Transport* grpc_create_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client); + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr ep, bool is_client); grpc_core::RefCountedPtr grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc index 9e4138ea50..c80fdd8307 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -28,11 +28,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include #include #include "src/core/ext/transport/chttp2/transport/http2_settings.h" @@ -233,10 +233,9 @@ void TransportFlowControl::UpdateSetting( FlowControlAction& (FlowControlAction::*set)(FlowControlAction::Urgency, uint32_t)) { if (new_desired_value != *desired_value) { - if (GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log(GPR_INFO, "[flowctl] UPDATE SETTING %s from %" PRId64 " to %d", - std::string(name).c_str(), *desired_value, new_desired_value); - } + GRPC_TRACE_LOG(flowctl, INFO) + << "[flowctl] UPDATE SETTING " << name << " from " << *desired_value + << " to " << new_desired_value; // Reaching zero can only happen for initial window size, and if it occurs // we really want to wake up writes and ensure all the queued stream // window updates are flushed, since stream flow control operates diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.h b/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.h index a0bd6323b0..b15e8603c2 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/flow_control.h @@ -32,7 +32,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include #include #include "src/core/ext/transport/chttp2/transport/http2_settings.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame.cc index 9e05cf6d85..92788903f1 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame.cc @@ -23,7 +23,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc index 3476ab1248..77739c3088 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -25,7 +25,6 @@ #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -55,7 +54,7 @@ absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, uint32_t write_bytes, int is_eof, - grpc_transport_one_way_stats* stats, + grpc_core::CallTracerInterface* call_tracer, grpc_slice_buffer* outbuf) { grpc_slice hdr; uint8_t* p; @@ -77,10 +76,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, grpc_slice_buffer_move_first_no_ref(inbuf, write_bytes, outbuf); - stats->framing_bytes += header_size; - if (!grpc_core::IsHttp2StatsFixEnabled()) { - stats->data_bytes += write_bytes; - } + call_tracer->RecordOutgoingBytes({header_size, 0, 0}); } grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( @@ -129,8 +125,7 @@ grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( if (min_progress_size != nullptr) *min_progress_size = 0; if (stream_out != nullptr) { - s->stats.incoming.framing_bytes += 5; - s->stats.incoming.data_bytes += length; + s->call_tracer_wrapper.RecordIncomingBytes({5, length, 0}); grpc_slice_buffer_move_first_into_buffer(slices, 5, header); grpc_slice_buffer_move_first(slices, length, stream_out->c_slice_buffer()); } diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.h b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.h index 1e628d48dd..eae1f439c3 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_data.h @@ -33,6 +33,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" // start processing a new data frame absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, @@ -49,7 +50,7 @@ grpc_error_handle grpc_chttp2_data_parser_parse(void* parser, void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, uint32_t write_bytes, int is_eof, - grpc_transport_one_way_stats* stats, + grpc_core::CallTracerInterface* call_tracer, grpc_slice_buffer* outbuf); grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc index fadce90139..31e7c76ba3 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc index 9a455c0baf..7b7b080e32 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -25,11 +25,11 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -93,10 +93,9 @@ grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, if (p->byte == 8) { CHECK(is_last); if (p->is_ack) { - if (GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "%s[%p]: received ping ack %" PRIx64, - t->is_client ? "CLIENT" : "SERVER", t, p->opaque_8bytes); - } + GRPC_TRACE_LOG(http2_ping, INFO) + << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: received ping ack " << p->opaque_8bytes; grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { if (!t->is_client) { @@ -104,16 +103,16 @@ grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, t->keepalive_permit_without_calls == 0 && t->stream_map.empty(); if (GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "SERVER[%p]: received ping %" PRIx64 ": %s", t, - p->opaque_8bytes, - t->ping_abuse_policy.GetDebugString(transport_idle).c_str()); + LOG(INFO) << "SERVER[" << t << "]: received ping " << p->opaque_8bytes + << ": " + << t->ping_abuse_policy.GetDebugString(transport_idle); } if (t->ping_abuse_policy.ReceivedOnePing(transport_idle)) { grpc_chttp2_exceeded_ping_strikes(t); } - } else if (GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "CLIENT[%p]: received ping %" PRIx64, t, - p->opaque_8bytes); + } else { + GRPC_TRACE_LOG(http2_ping, INFO) + << "CLIENT[" << t << "]: received ping " << p->opaque_8bytes; } if (t->ack_pings) { if (t->ping_ack_count == t->ping_ack_capacity) { diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index dd57065036..93e33a14a0 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -21,13 +21,13 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/distributions.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -39,11 +39,13 @@ #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" -grpc_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code, - grpc_transport_one_way_stats* stats) { +grpc_slice grpc_chttp2_rst_stream_create( + uint32_t id, uint32_t code, grpc_core::CallTracerInterface* call_tracer) { static const size_t frame_size = 13; grpc_slice slice = GRPC_SLICE_MALLOC(frame_size); - if (stats != nullptr) stats->framing_bytes += frame_size; + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes({frame_size, 0, 0}); + } uint8_t* p = GRPC_SLICE_START_PTR(slice); // Frame size. @@ -70,10 +72,10 @@ grpc_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code, void grpc_chttp2_add_rst_stream_to_next_write( grpc_chttp2_transport* t, uint32_t id, uint32_t code, - grpc_transport_one_way_stats* stats) { + grpc_core::CallTracerInterface* call_tracer) { t->num_pending_induced_frames++; grpc_slice_buffer_add(&t->qbuf, - grpc_chttp2_rst_stream_create(id, code, stats)); + grpc_chttp2_rst_stream_create(id, code, call_tracer)); } grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( @@ -102,7 +104,8 @@ grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, cur++; p->byte++; } - s->stats.incoming.framing_bytes += static_cast(end - cur); + uint64_t framing_bytes = static_cast(end - cur); + s->call_tracer_wrapper.RecordIncomingBytes({framing_bytes, 0, 0}); if (p->byte == 4) { CHECK(is_last); @@ -110,11 +113,9 @@ grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, ((static_cast(p->reason_bytes[1])) << 16) | ((static_cast(p->reason_bytes[2])) << 8) | ((static_cast(p->reason_bytes[3]))); - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, - "[chttp2 transport=%p stream=%p] received RST_STREAM(reason=%d)", - t, s, reason); - } + GRPC_TRACE_LOG(http, INFO) + << "[chttp2 transport=" << t << " stream=" << s + << "] received RST_STREAM(reason=" << reason << ")"; grpc_error_handle error; if (reason != GRPC_HTTP2_NO_ERROR || s->trailing_metadata_buffer.empty()) { error = grpc_error_set_int( diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 1da9c0e457..0e8e74b62a 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -27,20 +27,22 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" struct grpc_chttp2_rst_stream_parser { uint8_t byte; uint8_t reason_bytes[4]; }; -grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code, - grpc_transport_one_way_stats* stats); +grpc_slice grpc_chttp2_rst_stream_create( + uint32_t stream_id, uint32_t code, + grpc_core::CallTracerInterface* call_tracer); // Adds RST_STREAM frame to t->qbuf (buffer for the next write). Should be // called when we want to add RST_STREAM and we are not in // write_action_begin_locked. void grpc_chttp2_add_rst_stream_to_next_write( grpc_chttp2_transport* t, uint32_t id, uint32_t code, - grpc_transport_one_way_stats* stats); + grpc_core::CallTracerInterface* call_tracer); grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc index bea244c818..e0a12218ca 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -23,11 +23,11 @@ #include #include "absl/base/attributes.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/flow_control.h" @@ -110,7 +110,7 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, if (t->notify_on_receive_settings != nullptr) { if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::ExecCtx::Run(DEBUG_LOCATION, @@ -172,9 +172,9 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, parser->incoming_settings->initial_window_size(); if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log(GPR_INFO, "%p[%s] adding %d for initial_window change", t, - t->is_client ? "cli" : "svr", - static_cast(t->initial_window_update)); + LOG(INFO) << t << "[" << (t->is_client ? "cli" : "svr") + << "] adding " << t->initial_window_update + << " for initial_window change"; } } auto error = @@ -187,13 +187,11 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, "invalid value %u passed for %s", parser->value, grpc_core::Http2Settings::WireIdToName(parser->id).c_str())); } - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "CHTTP2:%s:%s: got setting %s = %d", - t->is_client ? "CLI" : "SVR", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::Http2Settings::WireIdToName(parser->id).c_str(), - parser->value); - } + GRPC_TRACE_LOG(http, INFO) + << "CHTTP2:" << (t->is_client ? "CLI" : "SVR") << ":" + << t->peer_string.as_string_view() << ": got setting " + << grpc_core::Http2Settings::WireIdToName(parser->id) << " = " + << parser->value; } break; } } diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc index f9824f7e03..6dafd5318b 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -25,17 +25,19 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include #include #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/internal.h" grpc_slice grpc_chttp2_window_update_create( - uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats) { + uint32_t id, uint32_t window_delta, + grpc_core::CallTracerInterface* call_tracer) { static const size_t frame_size = 13; grpc_slice slice = GRPC_SLICE_MALLOC(frame_size); - stats->framing_bytes += frame_size; + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes({frame_size, 0, 0}); + } uint8_t* p = GRPC_SLICE_START_PTR(slice); CHECK(window_delta); @@ -84,7 +86,8 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse( } if (s != nullptr) { - s->stats.incoming.framing_bytes += static_cast(end - cur); + uint64_t framing_bytes = static_cast(end - cur); + s->call_tracer_wrapper.RecordIncomingBytes({framing_bytes, 0, 0}); } if (p->byte == 4) { diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h index 92ea158701..53c5f41d3d 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -27,6 +27,7 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" struct grpc_chttp2_window_update_parser { uint8_t byte; @@ -34,7 +35,8 @@ struct grpc_chttp2_window_update_parser { uint32_t amount; }; grpc_slice grpc_chttp2_window_update_create( - uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats); + uint32_t id, uint32_t window_delta, + grpc_core::CallTracerInterface* call_tracer); grpc_error_handle grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 2ca62cd207..9fa6aa7964 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -22,10 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" @@ -87,7 +87,7 @@ void HPackCompressor::Frame(const EncodeHeaderOptions& options, if (options.is_end_of_stream) { flags |= GRPC_CHTTP2_DATA_FLAG_END_STREAM; } - options.stats->header_bytes += raw.Length(); + options.call_tracer->RecordOutgoingBytes({0, 0, raw.Length()}); while (frame_type == GRPC_CHTTP2_FRAME_HEADER || raw.Length() > 0) { // per the HTTP/2 spec: // A HEADERS frame without the END_HEADERS flag set MUST be followed by @@ -101,7 +101,7 @@ void HPackCompressor::Frame(const EncodeHeaderOptions& options, } FillHeader(grpc_slice_buffer_tiny_add(output, kHeadersFrameHeaderSize), frame_type, options.stream_id, len, flags); - options.stats->framing_bytes += kHeadersFrameHeaderSize; + options.call_tracer->RecordOutgoingBytes({kHeadersFrameHeaderSize, 0, 0}); grpc_slice_buffer_move_first(raw.c_slice_buffer(), len, output); frame_type = GRPC_CHTTP2_FRAME_CONTINUATION; @@ -117,10 +117,8 @@ void HPackCompressor::SetMaxUsableSize(uint32_t max_table_size) { void HPackCompressor::SetMaxTableSize(uint32_t max_table_size) { if (table_.SetMaxSize(std::min(max_usable_size_, max_table_size))) { advertise_table_size_change_ = true; - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "set max table size from encoder to %d", - max_table_size); - } + GRPC_TRACE_LOG(http, INFO) + << "set max table size from encoder to " << max_table_size; } } diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h index b3db3db70b..cfbf2426ec 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -25,12 +25,12 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" @@ -42,6 +42,7 @@ #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { @@ -208,9 +209,7 @@ class Compressor< void EncodeWith(MetadataTrait, const typename MetadataTrait::ValueType& value, Encoder* encoder) { if (value != known_value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat("Not encoding bad ", MetadataTrait::key(), " header") - .c_str()); + LOG(ERROR) << "Not encoding bad " << MetadataTrait::key() << " header"; encoder->NoteEncodingError(); return; } @@ -355,7 +354,7 @@ class HPackCompressor { bool is_end_of_stream; bool use_true_binary_metadata; size_t max_frame_size; - grpc_transport_one_way_stats* stats; + CallTracerInterface* call_tracer; }; template diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc index 3492fd5982..143781dca3 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc @@ -18,7 +18,6 @@ #include "absl/log/check.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parse_result.h index 0d3a57ad3d..b810264a36 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -27,7 +27,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 84b4e86279..04c64dd5df 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -28,6 +28,7 @@ #include "absl/base/attributes.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -37,7 +38,6 @@ #include "absl/types/variant.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/decode_huff.h" @@ -90,12 +90,14 @@ constexpr Base64InverseTable kBase64InverseTable; class HPackParser::Input { public: Input(grpc_slice_refcount* current_slice_refcount, const uint8_t* begin, - const uint8_t* end, absl::BitGenRef bitsrc, HpackParseResult& error) + const uint8_t* end, absl::BitGenRef bitsrc, + HpackParseResult& frame_error, HpackParseResult& field_error) : current_slice_refcount_(current_slice_refcount), begin_(begin), end_(end), frontier_(begin), - error_(error), + frame_error_(frame_error), + field_error_(field_error), bitsrc_(bitsrc) {} // If input is backed by a slice, retrieve its refcount. If not, return @@ -214,14 +216,18 @@ class HPackParser::Input { // Check if we saw an EOF bool eof_error() const { - return min_progress_size_ != 0 || error_.connection_error(); + return min_progress_size_ != 0 || frame_error_.connection_error(); + } + + // Reset the field error to be ok + void ClearFieldError() { + if (field_error_.ok()) return; + field_error_ = HpackParseResult(); } // Minimum number of bytes to unstuck the current parse size_t min_progress_size() const { return min_progress_size_; } - bool has_error() const { return !error_.ok(); } - // Set the current error - tweaks the error to include a stream id so that // chttp2 does not close the connection. // Intended for errors that are specific to a stream and recoverable. @@ -245,10 +251,7 @@ class HPackParser::Input { // read prior to being able to get further in this parse. void UnexpectedEOF(size_t min_progress_size) { CHECK_GT(min_progress_size, 0u); - if (min_progress_size_ != 0 || error_.connection_error()) { - DCHECK(eof_error()); - return; - } + if (eof_error()) return; // Set min progress size, taking into account bytes parsed already but not // consumed. min_progress_size_ = min_progress_size + (begin_ - frontier_); @@ -301,13 +304,18 @@ class HPackParser::Input { // Do not use this directly, instead use SetErrorAndContinueParsing or // SetErrorAndStopParsing. void SetError(HpackParseResult error) { - if (!error_.ok() || min_progress_size_ > 0) { - if (error.connection_error() && !error_.connection_error()) { - error_ = std::move(error); // connection errors dominate + SetErrorFor(frame_error_, error); + SetErrorFor(field_error_, std::move(error)); + } + + void SetErrorFor(HpackParseResult& error, HpackParseResult new_error) { + if (!error.ok() || min_progress_size_ > 0) { + if (new_error.connection_error() && !error.connection_error()) { + error = std::move(new_error); // connection errors dominate } return; } - error_ = std::move(error); + error = std::move(new_error); } // Refcount if we are backed by a slice @@ -319,7 +327,8 @@ class HPackParser::Input { // Frontier denotes the first byte past successfully processed input const uint8_t* frontier_; // Current error - HpackParseResult& error_; + HpackParseResult& frame_error_; + HpackParseResult& field_error_; // If the error was EOF, we flag it here by noting how many more bytes would // be needed to make progress size_t min_progress_size_ = 0; @@ -596,6 +605,7 @@ class HPackParser::Parser { bool ParseTop() { DCHECK(state_.parse_state == ParseState::kTop); auto cur = *input_->Next(); + input_->ClearFieldError(); switch (cur >> 4) { // Literal header not indexed - First byte format: 0000xxxx // Literal header never indexed - First byte format: 0001xxxx @@ -700,20 +710,21 @@ class HPackParser::Parser { type = "???"; break; } - gpr_log( - GPR_DEBUG, "HTTP:%d:%s:%s: %s%s", log_info_.stream_id, type, - log_info_.is_client ? "CLI" : "SVR", memento.md.DebugString().c_str(), - memento.parse_status == nullptr - ? "" - : absl::StrCat(" (parse error: ", - memento.parse_status->Materialize().ToString(), ")") - .c_str()); + LOG(INFO) << "HTTP:" << log_info_.stream_id << ":" << type << ":" + << (log_info_.is_client ? "CLI" : "SVR") << ": " + << memento.md.DebugString() + << (memento.parse_status.get() == nullptr + ? "" + : absl::StrCat( + " (parse error: ", + memento.parse_status->Materialize().ToString(), + ")")); } void EmitHeader(const HPackTable::Memento& md) { // Pass up to the transport state_.frame_length += md.md.transport_size(); - if (md.parse_status != nullptr) { + if (md.parse_status.get() != nullptr) { // Reject any requests with invalid metadata. input_->SetErrorAndContinueParsing(*md.parse_status); } @@ -950,11 +961,10 @@ class HPackParser::Parser { state_.string_length) : String::Parse(input_, state_.is_string_huff_compressed, state_.string_length); - HpackParseResult& status = state_.frame_error; absl::string_view key_string; if (auto* s = absl::get_if(&state_.key)) { key_string = s->as_string_view(); - if (status.ok()) { + if (state_.field_error.ok()) { auto r = ValidateKey(key_string); if (r != ValidateMetadataResult::kOk) { input_->SetErrorAndContinueParsing( @@ -964,7 +974,7 @@ class HPackParser::Parser { } else { const auto* memento = absl::get(state_.key); key_string = memento->md.key(); - if (status.ok() && memento->parse_status != nullptr) { + if (state_.field_error.ok() && memento->parse_status.get() != nullptr) { input_->SetErrorAndContinueParsing(*memento->parse_status); } } @@ -991,16 +1001,15 @@ class HPackParser::Parser { key_string.size() + value.wire_size + hpack_constants::kEntryOverhead; auto md = grpc_metadata_batch::Parse( key_string, std::move(value_slice), state_.add_to_table, transport_size, - [key_string, &status, this](absl::string_view message, const Slice&) { - if (!status.ok()) return; + [key_string, this](absl::string_view message, const Slice&) { + if (!state_.field_error.ok()) return; input_->SetErrorAndContinueParsing( HpackParseResult::MetadataParseError(key_string)); - gpr_log(GPR_ERROR, "Error parsing '%s' metadata: %s", - std::string(key_string).c_str(), - std::string(message).c_str()); + LOG(ERROR) << "Error parsing '" << key_string + << "' metadata: " << message; }); - HPackTable::Memento memento{std::move(md), - status.PersistentStreamErrorOrNullptr()}; + HPackTable::Memento memento{ + std::move(md), state_.field_error.PersistentStreamErrorOrNullptr()}; input_->UpdateFrontier(); state_.parse_state = ParseState::kTop; if (state_.add_to_table) { @@ -1113,13 +1122,13 @@ grpc_error_handle HPackParser::Parse( std::vector buffer = std::move(unparsed_bytes_); return ParseInput( Input(nullptr, buffer.data(), buffer.data() + buffer.size(), bitsrc, - state_.frame_error), + state_.frame_error, state_.field_error), is_last, call_tracer); } - return ParseInput( - Input(slice.refcount, GRPC_SLICE_START_PTR(slice), - GRPC_SLICE_END_PTR(slice), bitsrc, state_.frame_error), - is_last, call_tracer); + return ParseInput(Input(slice.refcount, GRPC_SLICE_START_PTR(slice), + GRPC_SLICE_END_PTR(slice), bitsrc, state_.frame_error, + state_.field_error), + is_last, call_tracer); } grpc_error_handle HPackParser::ParseInput( diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h index 463e051dc2..9df4487f31 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -235,6 +235,8 @@ class HPackParser { HPackTable hpack_table; // Error so far for this frame (set by class Input) HpackParseResult frame_error; + // Error so far for this field (set by class Input) + HpackParseResult field_error; // Length of frame so far. uint32_t frame_length = 0; // Length of the string being parsed diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc index f27f7a1019..7a0b7bd849 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc @@ -37,6 +37,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice.h" +#include "src/core/telemetry/stats.h" namespace grpc_core { @@ -47,6 +48,10 @@ void HPackTable::MementoRingBuffer::Put(Memento m) { return entries_.push_back(std::move(m)); } size_t index = (first_entry_ + num_entries_) % max_entries_; + if (timestamp_index_ == kNoTimestamp) { + timestamp_index_ = index; + timestamp_ = Timestamp::Now(); + } entries_[index] = std::move(m); ++num_entries_; } @@ -54,12 +59,31 @@ void HPackTable::MementoRingBuffer::Put(Memento m) { auto HPackTable::MementoRingBuffer::PopOne() -> Memento { CHECK_GT(num_entries_, 0u); size_t index = first_entry_ % max_entries_; + if (index == timestamp_index_) { + global_stats().IncrementHttp2HpackEntryLifetime( + (Timestamp::Now() - timestamp_).millis()); + timestamp_index_ = kNoTimestamp; + } ++first_entry_; --num_entries_; - return std::move(entries_[index]); + auto& entry = entries_[index]; + if (!entry.parse_status.TestBit(Memento::kUsedBit)) { + global_stats().IncrementHttp2HpackMisses(); + } + return std::move(entry); } -auto HPackTable::MementoRingBuffer::Lookup(uint32_t index) const +auto HPackTable::MementoRingBuffer::Lookup(uint32_t index) -> const Memento* { + if (index >= num_entries_) return nullptr; + uint32_t offset = (num_entries_ - 1u - index + first_entry_) % max_entries_; + auto& entry = entries_[offset]; + const bool was_used = entry.parse_status.TestBit(Memento::kUsedBit); + entry.parse_status.SetBit(Memento::kUsedBit); + if (!was_used) global_stats().IncrementHttp2HpackHits(); + return &entry; +} + +auto HPackTable::MementoRingBuffer::Peek(uint32_t index) const -> const Memento* { if (index >= num_entries_) return nullptr; uint32_t offset = (num_entries_ - 1u - index + first_entry_) % max_entries_; @@ -79,14 +103,22 @@ void HPackTable::MementoRingBuffer::Rebuild(uint32_t max_entries) { entries_.swap(entries); } -void HPackTable::MementoRingBuffer::ForEach( - absl::FunctionRef f) const { +template +void HPackTable::MementoRingBuffer::ForEach(F f) const { uint32_t index = 0; - while (auto* m = Lookup(index++)) { + while (auto* m = Peek(index++)) { f(index, *m); } } +HPackTable::MementoRingBuffer::~MementoRingBuffer() { + ForEach([](uint32_t, const Memento& m) { + if (!m.parse_status.TestBit(Memento::kUsedBit)) { + global_stats().IncrementHttp2HpackMisses(); + } + }); +} + // Evict one element from the table void HPackTable::EvictOne() { auto first_entry = entries_.PopOne(); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index d126b3eeb4..06e0aeb7f4 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -21,6 +21,8 @@ #include +#include +#include #include #include #include @@ -34,6 +36,7 @@ #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/parsed_metadata.h" +#include "src/core/util/unique_ptr_with_bitset.h" namespace grpc_core { @@ -54,11 +57,14 @@ class HPackTable { struct Memento { ParsedMetadata md; - std::unique_ptr parse_status; + // Alongside parse_status we store one bit indicating whether this memento + // has been looked up (and therefore consumed) or not. + UniquePtrWithBitset parse_status; + static const int kUsedBit = 0; }; // Lookup, but don't ref. - const Memento* Lookup(uint32_t index) const { + const Memento* Lookup(uint32_t index) { // Static table comes first, just return an entry from it. // NB: This imposes the constraint that the first // GRPC_CHTTP2_LAST_STATIC_ENTRY entries in the core static metadata table @@ -97,6 +103,14 @@ class HPackTable { class MementoRingBuffer { public: + MementoRingBuffer() {} + ~MementoRingBuffer(); + + MementoRingBuffer(const MementoRingBuffer&) = delete; + MementoRingBuffer& operator=(const MementoRingBuffer&) = delete; + MementoRingBuffer(MementoRingBuffer&&) = default; + MementoRingBuffer& operator=(MementoRingBuffer&&) = default; + // Rebuild this buffer with a new max_entries_ size. void Rebuild(uint32_t max_entries); @@ -109,10 +123,11 @@ class HPackTable { Memento PopOne(); // Lookup the entry at index, or return nullptr if none exists. - const Memento* Lookup(uint32_t index) const; + const Memento* Lookup(uint32_t index); + const Memento* Peek(uint32_t index) const; - void ForEach(absl::FunctionRef - f) const; + template + void ForEach(F f) const; uint32_t max_entries() const { return max_entries_; } uint32_t num_entries() const { return num_entries_; } @@ -126,11 +141,17 @@ class HPackTable { // Maximum number of entries we could possibly fit in the table, given // defined overheads. uint32_t max_entries_ = hpack_constants::kInitialTableEntries; + // Which index holds a timestamp (or kNoTimestamp if none do). + static constexpr uint32_t kNoTimestamp = + std::numeric_limits::max(); + uint32_t timestamp_index_ = kNoTimestamp; + // The timestamp associated with timestamp_entry_. + Timestamp timestamp_; std::vector entries_; }; - const Memento* LookupDynamic(uint32_t index) const { + const Memento* LookupDynamic(uint32_t index) { // Not static - find the value in the list of valid entries const uint32_t tbl_index = index - (hpack_constants::kLastStaticEntry + 1); return entries_.Lookup(tbl_index); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/internal.h b/deps/grpc/src/core/ext/transport/chttp2/transport/internal.h index 6e077a835e..64f398807b 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/internal.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/internal.h @@ -52,7 +52,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" @@ -226,7 +225,8 @@ typedef enum { struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, public grpc_core::KeepsGrpcInitialized { grpc_chttp2_transport(const grpc_core::ChannelArgs& channel_args, - grpc_endpoint* ep, bool is_client); + grpc_core::OrphanablePtr endpoint, + bool is_client); ~grpc_chttp2_transport() override; void Orphan() override; @@ -257,7 +257,7 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, grpc_pollset_set* pollset_set) override; void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* ep; + grpc_core::OrphanablePtr ep; grpc_core::Mutex ep_destroy_mu; // Guards endpoint destruction only. grpc_core::Slice peer_string; @@ -382,8 +382,6 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid; grpc_closure retry_initiate_ping_locked; - grpc_core::Chttp2MaxConcurrentStreamsPolicy max_concurrent_streams_policy; - /// ping acks size_t ping_ack_count = 0; size_t ping_ack_capacity = 0; @@ -544,6 +542,8 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, // What percentage of rst_stream frames on the server should cause a ping // frame to be generated. uint8_t ping_on_rst_stream_percent; + + GPR_NO_UNIQUE_ADDRESS grpc_core::latent_see::Flow write_flow; }; typedef enum { @@ -553,6 +553,51 @@ typedef enum { GRPC_METADATA_PUBLISHED_AT_CLOSE } grpc_published_metadata_method; +namespace grpc_core { + +// A CallTracer wrapper that updates both the legacy and new APIs for +// transport byte sizes. +// TODO(ctiller): This can go away as part of removing the +// grpc_transport_stream_stats struct. +class Chttp2CallTracerWrapper final : public CallTracerInterface { + public: + explicit Chttp2CallTracerWrapper(grpc_chttp2_stream* stream) + : stream_(stream) {} + + void RecordIncomingBytes( + const TransportByteSize& transport_byte_size) override; + void RecordOutgoingBytes( + const TransportByteSize& transport_byte_size) override; + + // Everything else is a no-op. + void RecordSendInitialMetadata( + grpc_metadata_batch* /*send_initial_metadata*/) override {} + void RecordSendTrailingMetadata( + grpc_metadata_batch* /*send_trailing_metadata*/) override {} + void RecordSendMessage(const SliceBuffer& /*send_message*/) override {} + void RecordSendCompressedMessage( + const SliceBuffer& /*send_compressed_message*/) override {} + void RecordReceivedInitialMetadata( + grpc_metadata_batch* /*recv_initial_metadata*/) override {} + void RecordReceivedMessage(const SliceBuffer& /*recv_message*/) override {} + void RecordReceivedDecompressedMessage( + const SliceBuffer& /*recv_decompressed_message*/) override {} + void RecordCancel(grpc_error_handle /*cancel_error*/) override {} + std::shared_ptr StartNewTcpTrace() override { + return nullptr; + } + void RecordAnnotation(absl::string_view /*annotation*/) override {} + void RecordAnnotation(const Annotation& /*annotation*/) override {} + std::string TraceId() override { return ""; } + std::string SpanId() override { return ""; } + bool IsSampled() override { return false; } + + private: + grpc_chttp2_stream* stream_; +}; + +} // namespace grpc_core + struct grpc_chttp2_stream { grpc_chttp2_stream(grpc_chttp2_transport* t, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena); @@ -652,7 +697,11 @@ struct grpc_chttp2_stream { /// Number of times written int64_t write_counter = 0; + grpc_core::Chttp2CallTracerWrapper call_tracer_wrapper; + /// Only set when enabled. + // TODO(roth): Remove this when the call_tracer_in_transport + // experiment finishes rolling out. grpc_core::CallTracerAnnotationInterface* call_tracer = nullptr; /// Only set when enabled. @@ -807,13 +856,8 @@ void grpc_chttp2_settings_timeout( #define GRPC_CHTTP2_CLIENT_CONNECT_STRLEN \ (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1) -// -#define GRPC_CHTTP2_IF_TRACING(stmt) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(http)) { \ - (stmt); \ - } \ - } while (0) +#define GRPC_CHTTP2_IF_TRACING(severity) \ + LOG_IF(severity, GRPC_TRACE_FLAG_ENABLED(http)) void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* stream, diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc deleted file mode 100644 index 355e40898a..0000000000 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2023 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" - -#include - -#include "absl/log/check.h" - -#include -#include - -namespace grpc_core { - -void Chttp2MaxConcurrentStreamsPolicy::AddDemerit() { - ++new_demerits_; - ++unacked_demerits_; -} - -void Chttp2MaxConcurrentStreamsPolicy::FlushedSettings() { - sent_demerits_ += std::exchange(new_demerits_, 0); -} - -void Chttp2MaxConcurrentStreamsPolicy::AckLastSend() { - CHECK(unacked_demerits_ >= sent_demerits_); - unacked_demerits_ -= std::exchange(sent_demerits_, 0); -} - -uint32_t Chttp2MaxConcurrentStreamsPolicy::AdvertiseValue() const { - if (target_ < unacked_demerits_) return 0; - return target_ - unacked_demerits_; -} - -} // namespace grpc_core diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h b/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h deleted file mode 100644 index a2a56d2bfe..0000000000 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2023 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_MAX_CONCURRENT_STREAMS_POLICY_H -#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_MAX_CONCURRENT_STREAMS_POLICY_H - -#include -#include - -#include - -namespace grpc_core { - -class Chttp2MaxConcurrentStreamsPolicy { - public: - // Set the target number of concurrent streams. - // If everything is idle we should advertise this number. - void SetTarget(uint32_t target) { target_ = target; } - - // Add one demerit to the current target. - // We need to do one full settings round trip after this to clear this - // demerit. - // It will reduce our advertised max concurrent streams by one. - void AddDemerit(); - - // Notify the policy that we've sent a settings frame. - // Newly added demerits since the last settings frame was sent will be cleared - // once that settings frame is acknowledged. - void FlushedSettings(); - - // Notify the policy that we've received an acknowledgement for the last - // settings frame we sent. - void AckLastSend(); - - // Returns what we should advertise as max concurrent streams. - uint32_t AdvertiseValue() const; - - private: - uint32_t target_ = std::numeric_limits::max(); - // Demerit flow: - // When we add a demerit, we add to both new & unacked. - // When we flush settings, we move new to sent. - // When we ack settings, we remove what we sent from unacked. - // eg: - // we add 10 demerits - now new=10, sent=0, unacked=10 - // we send settings - now new=0, sent=10, unacked=10 - // we add 5 demerits - now new=5, sent=10, unacked=15 - // we get the settings ack - now new=5, sent=0, unacked=5 - uint32_t new_demerits_ = 0; - uint32_t sent_demerits_ = 0; - uint32_t unacked_demerits_ = 0; -}; - -} // namespace grpc_core - -#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_MAX_CONCURRENT_STREAMS_POLICY_H diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/parsing.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/parsing.cc index e0a8297b31..d8c1680c3b 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/parsing.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include "src/core/channelz/channelz.h" @@ -56,7 +55,6 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" #include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/debug/trace.h" @@ -206,6 +204,8 @@ std::string FrameTypeString(uint8_t frame_type, uint8_t flags) { absl::variant grpc_chttp2_perform_read( grpc_chttp2_transport* t, const grpc_slice& slice, size_t& requests_started) { + GRPC_LATENT_SEE_INNER_SCOPE("grpc_chttp2_perform_read"); + const uint8_t* beg = GRPC_SLICE_START_PTR(slice); const uint8_t* end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; @@ -331,12 +331,11 @@ absl::variant grpc_chttp2_perform_read( case GRPC_DTS_FH_8: DCHECK_LT(cur, end); t->incoming_stream_id |= (static_cast(*cur)); - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "INCOMING[%p]: %s len:%d id:0x%08x", t, - FrameTypeString(t->incoming_frame_type, t->incoming_frame_flags) - .c_str(), - t->incoming_frame_size, t->incoming_stream_id); - } + GRPC_TRACE_LOG(http, INFO) + << "INCOMING[" << t << "]: " + << FrameTypeString(t->incoming_frame_type, t->incoming_frame_flags) + << " len:" << t->incoming_frame_size + << absl::StrFormat(" id:0x%08x", t->incoming_stream_id); t->deframe_state = GRPC_DTS_FRAME; err = init_frame_parser(t, requests_started); if (!err.ok()) { @@ -452,9 +451,9 @@ static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t, case GRPC_CHTTP2_FRAME_GOAWAY: return init_goaway_parser(t); default: - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "Unknown frame type %02x", t->incoming_frame_type); - } + GRPC_TRACE_LOG(http, ERROR) + << "Unknown frame type " + << absl::StrFormat("%02x", t->incoming_frame_type); return init_non_header_skip_frame_parser(t); } } @@ -554,7 +553,7 @@ static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t) { return init_non_header_skip_frame_parser(t); } s->received_bytes += t->incoming_frame_size; - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); if (s->read_closed) { return init_non_header_skip_frame_parser(t); } @@ -573,7 +572,7 @@ static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t) { absl_status_to_grpc_error(status)); grpc_chttp2_add_rst_stream_to_next_write(t, t->incoming_stream_id, GRPC_HTTP2_PROTOCOL_ERROR, - &s->stats.outgoing); + &s->call_tracer_wrapper); return init_non_header_skip_frame_parser(t); } else { return absl_status_to_grpc_error(status); @@ -611,9 +610,8 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { if (GPR_UNLIKELY(is_continuation)) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_ERROR, - "grpc_chttp2_stream disbanded before CONTINUATION received")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "grpc_chttp2_stream disbanded before CONTINUATION received"; return init_header_skip_frame_parser(t, priority_type, is_eoh); } if (t->is_client) { @@ -621,23 +619,21 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, t->incoming_stream_id < t->next_stream_id)) { // this is an old (probably cancelled) grpc_chttp2_stream } else { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring new grpc_chttp2_stream creation on client"; } return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY(t->last_new_stream_id >= t->incoming_stream_id)) { - GRPC_CHTTP2_IF_TRACING(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", - t->last_new_stream_id, t->incoming_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring out of order new grpc_chttp2_stream request on server; " + "last grpc_chttp2_stream id=" + << t->last_new_stream_id + << ", new grpc_chttp2_stream id=" << t->incoming_stream_id; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY((t->incoming_stream_id & 1) == 0)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, - "ignoring grpc_chttp2_stream with non-client generated index %d", - t->incoming_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring grpc_chttp2_stream with non-client generated index " + << t->incoming_stream_id; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY(t->stream_map.size() + t->extra_streams >= t->settings.acked().max_concurrent_streams())) { @@ -650,7 +646,7 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, } else if (GPR_UNLIKELY( t->max_concurrent_streams_overload_protection && t->streams_allocated.load(std::memory_order_relaxed) > - t->max_concurrent_streams_policy.AdvertiseValue())) { + t->settings.local().max_concurrent_streams())) { // We have more streams allocated than we'd like, so apply some pushback // by refusing this stream. ++t->num_pending_induced_frames; @@ -659,13 +655,12 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, GRPC_HTTP2_REFUSED_STREAM, nullptr)); grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); return init_header_skip_frame_parser(t, priority_type, is_eoh); - } else if (GPR_UNLIKELY( - t->stream_map.size() >= - t->max_concurrent_streams_policy.AdvertiseValue() && - grpc_core::RandomEarlyDetection( - t->max_concurrent_streams_policy.AdvertiseValue(), - t->settings.acked().max_concurrent_streams()) - .Reject(t->stream_map.size(), t->bitgen))) { + } else if (GPR_UNLIKELY(t->stream_map.size() >= + t->settings.local().max_concurrent_streams() && + grpc_core::RandomEarlyDetection( + t->settings.local().max_concurrent_streams(), + t->settings.acked().max_concurrent_streams()) + .Reject(t->stream_map.size(), t->bitgen))) { // We are under the limit of max concurrent streams for the current // setting, but are over the next value that will be advertised. // Apply some backpressure by randomly not accepting new streams. @@ -678,21 +673,22 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, } else if (t->sent_goaway_state == GRPC_CHTTP2_FINAL_GOAWAY_SENT || t->sent_goaway_state == GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "transport:%p SERVER peer:%s Final GOAWAY sent. Ignoring new " - "grpc_chttp2_stream request id=%d, last grpc_chttp2_stream id=%d", - t, std::string(t->peer_string.as_string_view()).c_str(), - t->incoming_stream_id, t->last_new_stream_id)); + GRPC_CHTTP2_IF_TRACING(INFO) + << "transport:" << t + << " SERVER peer:" << t->peer_string.as_string_view() + << " Final GOAWAY sent. Ignoring new grpc_chttp2_stream request " + "id=" + << t->incoming_stream_id + << ", last grpc_chttp2_stream id=" << t->last_new_stream_id; + ; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (t->num_incoming_streams_before_settings_ack == 0) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, - "transport:%p SERVER peer:%s rejecting grpc_chttp2_stream id=%d, " - "last grpc_chttp2_stream id=%d before settings have been " - "acknowledged", - t, std::string(t->peer_string.as_string_view()).c_str(), - t->incoming_stream_id, t->last_new_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "transport:" << t + << " SERVER peer:" << t->peer_string.as_string_view() + << " rejecting grpc_chttp2_stream id=" << t->incoming_stream_id + << ", last grpc_chttp2_stream id=" << t->last_new_stream_id + << " before settings have been acknowledged"; ++t->num_pending_induced_frames; grpc_slice_buffer_add( &t->qbuf, @@ -708,18 +704,16 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, grpc_chttp2_parsing_accept_stream(t, t->incoming_stream_id); ++requests_started; if (GPR_UNLIKELY(s == nullptr)) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted")); + GRPC_CHTTP2_IF_TRACING(ERROR) << "grpc_chttp2_stream not accepted"; return init_header_skip_frame_parser(t, priority_type, is_eoh); } if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(chttp2_new_stream)) { - gpr_log(GPR_INFO, - "[t:%p fd:%d peer:%s] Accepting new stream; " - "num_incoming_streams_before_settings_ack=%u", - t, grpc_endpoint_get_fd(t->ep), - std::string(t->peer_string.as_string_view()).c_str(), - t->num_incoming_streams_before_settings_ack); + LOG(INFO) << "[t:" << t << " fd:" << grpc_endpoint_get_fd(t->ep.get()) + << " peer:" << t->peer_string.as_string_view() + << "] Accepting new stream; " + "num_incoming_streams_before_settings_ack=" + << t->num_incoming_streams_before_settings_ack; } if (t->channelz_socket != nullptr) { t->channelz_socket->RecordStreamStartedFromRemote(); @@ -728,10 +722,10 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, t->incoming_stream = s; } DCHECK_NE(s, nullptr); - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); if (GPR_UNLIKELY(s->read_closed)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, "skipping already closed grpc_chttp2_stream header")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "skipping already closed grpc_chttp2_stream header"; t->incoming_stream = nullptr; return init_header_skip_frame_parser(t, priority_type, is_eoh); } @@ -745,7 +739,7 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, switch (s->header_frames_received) { case 0: if (t->is_client && t->header_eof) { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing Trailers-Only")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing Trailers-Only"; if (s->trailing_metadata_available != nullptr) { *s->trailing_metadata_available = true; } @@ -755,13 +749,13 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, incoming_metadata_buffer = &s->trailing_metadata_buffer; frame_type = HPackParser::LogInfo::kTrailers; } else { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing initial_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing initial_metadata"; incoming_metadata_buffer = &s->initial_metadata_buffer; frame_type = HPackParser::LogInfo::kHeaders; } break; case 1: - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing trailing_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing trailing_metadata"; incoming_metadata_buffer = &s->trailing_metadata_buffer; frame_type = HPackParser::LogInfo::kTrailers; break; @@ -793,13 +787,11 @@ static grpc_error_handle init_window_update_frame_parser( grpc_chttp2_stream* s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "Stream %d not found, ignoring WINDOW_UPDATE", - t->incoming_stream_id); - } + GRPC_TRACE_LOG(http, ERROR) << "Stream " << t->incoming_stream_id + << " not found, ignoring WINDOW_UPDATE"; return init_non_header_skip_frame_parser(t); } - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); } t->parser = grpc_chttp2_transport::Parser{ "window_update", grpc_chttp2_window_update_parser_parse, @@ -825,12 +817,9 @@ static grpc_error_handle init_rst_stream_parser(grpc_chttp2_transport* t) { if (!t->incoming_stream) { return init_non_header_skip_frame_parser(t); } - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); t->parser = grpc_chttp2_transport::Parser{ "rst_stream", grpc_chttp2_rst_stream_parser_parse, &t->simple.rst_stream}; - if (!t->is_client && grpc_core::IsRstpitEnabled()) { - t->max_concurrent_streams_policy.AddDemerit(); - } return absl::OkStatus(); } @@ -855,7 +844,6 @@ static grpc_error_handle init_settings_frame_parser(grpc_chttp2_transport* t) { return err; } if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_ACK) { - t->max_concurrent_streams_policy.AckLastSend(); if (!t->settings.AckLastSend()) { return GRPC_ERROR_CREATE("Received unexpected settings ack"); } @@ -895,10 +883,8 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, if (GPR_LIKELY(err.ok())) { return err; } - if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "INCOMING[%p;%p]: Parse failed with %s", t, s, - err.ToString().c_str()); - } + GRPC_TRACE_LOG(http, ERROR) + << "INCOMING[" << t << ";" << s << "]: Parse failed with " << err; if (grpc_error_get_int(err, grpc_core::StatusIntProperty::kStreamId, &unused)) { grpc_chttp2_parsing_become_skip_parser(t); @@ -921,7 +907,7 @@ static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) { grpc_chttp2_transport* t = s->t.get(); if (!s->write_closed) { grpc_chttp2_add_rst_stream_to_next_write(t, s->id, GRPC_HTTP2_NO_ERROR, - &s->stats.outgoing); + &s->call_tracer_wrapper); grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); grpc_chttp2_mark_stream_closed(t, s, true, true, absl::OkStatus()); } @@ -936,9 +922,12 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, auto* parser = static_cast(hpack_parser); grpc_core::CallTracerAnnotationInterface* call_tracer = nullptr; if (s != nullptr) { - s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); + s->call_tracer_wrapper.RecordIncomingBytes( + {0, 0, GRPC_SLICE_LENGTH(slice)}); call_tracer = - s->arena->GetContext(); + grpc_core::IsCallTracerInTransportEnabled() + ? s->arena->GetContext() + : s->arena->GetContext(); } grpc_error_handle error = parser->Parse( slice, is_last != 0, absl::BitGenRef(t->bitgen), call_tracer); diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/ping_callbacks.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/ping_callbacks.cc index b568ad860a..4bd16e1fbb 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/ping_callbacks.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/ping_callbacks.cc @@ -20,7 +20,6 @@ #include "absl/meta/type_traits.h" #include "absl/random/distributions.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.cc index 22918442b7..f2ac00e957 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -17,8 +17,8 @@ // #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -69,8 +69,8 @@ static bool stream_list_pop(grpc_chttp2_transport* t, } *stream = s; if (s && GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: pop from %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); + LOG(INFO) << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: pop from " << stream_list_id_string(id); } return s != nullptr; } @@ -90,10 +90,9 @@ static void stream_list_remove(grpc_chttp2_transport* t, grpc_chttp2_stream* s, } else { t->lists[id].tail = s->links[id].prev; } - if (GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: remove from %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); - } + GRPC_TRACE_LOG(http2_stream_state, INFO) + << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: remove from " << stream_list_id_string(id); } static bool stream_list_maybe_remove(grpc_chttp2_transport* t, @@ -122,10 +121,9 @@ static void stream_list_add_tail(grpc_chttp2_transport* t, } t->lists[id].tail = s; s->included.set(id); - if (GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: add to %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); - } + GRPC_TRACE_LOG(http2_stream_state, INFO) + << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: add to " << stream_list_id_string(id); } static bool stream_list_add(grpc_chttp2_transport* t, grpc_chttp2_stream* s, diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/varint.h b/deps/grpc/src/core/ext/transport/chttp2/transport/varint.h index c02d5d1031..3dcf32aa60 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/varint.h +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/varint.h @@ -24,7 +24,6 @@ #include "absl/log/check.h" -#include #include // Helpers for hpack varint encoding diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/write_size_policy.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/write_size_policy.cc index f8ec481d7f..63e8d2b7e2 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/write_size_policy.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/write_size_policy.cc @@ -18,7 +18,6 @@ #include "absl/log/check.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/ext/transport/chttp2/transport/writing.cc b/deps/grpc/src/core/ext/transport/chttp2/transport/writing.cc index 7112e1ffbf..29c3b67e82 100644 --- a/deps/grpc/src/core/ext/transport/chttp2/transport/writing.cc +++ b/deps/grpc/src/core/ext/transport/chttp2/transport/writing.cc @@ -27,12 +27,12 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/types/optional.h" #include #include -#include #include #include @@ -49,7 +49,6 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" @@ -136,10 +135,10 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "%s[%p]: Ping %" PRIx64 " sent [%s]: %s", - t->is_client ? "CLIENT" : "SERVER", t, id, - std::string(t->peer_string.as_string_view()).c_str(), - t->ping_rate_policy.GetDebugString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping " << id << " sent [" + << std::string(t->peer_string.as_string_view()) + << "]: " << t->ping_rate_policy.GetDebugString(); } }, [t](grpc_core::Chttp2PingRatePolicy::TooManyRecentPings) { @@ -148,11 +147,11 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, - "%s[%p]: Ping delayed [%s]: too many recent pings: %s", - t->is_client ? "CLIENT" : "SERVER", t, - std::string(t->peer_string.as_string_view()).c_str(), - t->ping_rate_policy.GetDebugString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping delayed [" + << std::string(t->peer_string.as_string_view()) + << "]: too many recent pings: " + << t->ping_rate_policy.GetDebugString(); } }, [t](grpc_core::Chttp2PingRatePolicy::TooSoon too_soon) { @@ -161,15 +160,14 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log( - GPR_INFO, - "%s[%p]: Ping delayed [%s]: not enough time elapsed since last " - "ping. Last ping:%s, minimum wait:%s need to wait:%s", - t->is_client ? "CLIENT" : "SERVER", t, - std::string(t->peer_string.as_string_view()).c_str(), - too_soon.last_ping.ToString().c_str(), - too_soon.next_allowed_ping_interval.ToString().c_str(), - too_soon.wait.ToString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping delayed [" + << std::string(t->peer_string.as_string_view()) + << "]: not enough time elapsed since last " + "ping. Last ping:" + << too_soon.last_ping + << ", minimum wait:" << too_soon.next_allowed_ping_interval + << ", need to wait:" << too_soon.wait; } if (t->delayed_ping_timer_handle == grpc_event_engine::experimental::EventEngine::TaskHandle:: @@ -206,24 +204,21 @@ static bool update_list(grpc_chttp2_transport* t, int64_t send_bytes, static void report_stall(grpc_chttp2_transport* t, grpc_chttp2_stream* s, const char* staller) { - if (GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log( - GPR_DEBUG, - "%s:%p stream %d moved to stalled list by %s. This is FULLY expected " - "to happen in a healthy program that is not seeing flow control stalls." - " However, if you know that there are unwanted stalls, here is some " - "helpful data: [fc:pending=%" PRIdPTR ":flowed=%" PRId64 - ":peer_initwin=%d:t_win=%" PRId64 ":s_win=%d:s_delta=%" PRId64 "]", - std::string(t->peer_string.as_string_view()).c_str(), t, s->id, staller, - s->flow_controlled_buffer.length, s->flow_controlled_bytes_flowed, - t->settings.acked().initial_window_size(), - t->flow_control.remote_window(), - static_cast(std::max( - int64_t{0}, s->flow_control.remote_window_delta() + - static_cast( - t->settings.peer().initial_window_size()))), - s->flow_control.remote_window_delta()); - } + GRPC_TRACE_VLOG(flowctl, 2) + << t->peer_string.as_string_view() << ":" << t << " stream " << s->id + << " moved to stalled list by " << staller + << ". This is FULLY expected to happen in a healthy program that is not " + "seeing flow control stalls. However, if you know that there are " + "unwanted stalls, here is some helpful data: [fc:pending=" + << s->flow_controlled_buffer.length + << ":flowed=" << s->flow_controlled_bytes_flowed + << ":peer_initwin=" << t->settings.acked().initial_window_size() + << ":t_win=" << t->flow_control.remote_window() << ":s_win=" + << static_cast(std::max( + int64_t{0}, s->flow_control.remote_window_delta() + + static_cast( + t->settings.peer().initial_window_size()))) + << ":s_delta=" << s->flow_control.remote_window_delta() << "]"; } namespace { @@ -261,8 +256,6 @@ class WriteContext { } void FlushSettings() { - t_->settings.mutable_local().SetMaxConcurrentStreams( - t_->max_concurrent_streams_policy.AdvertiseValue()); auto update = t_->settings.MaybeSendUpdate(); if (update.has_value()) { grpc_core::Http2Frame frame(std::move(*update)); @@ -281,7 +274,6 @@ class WriteContext { }); } t_->flow_control.FlushedSettings(); - t_->max_concurrent_streams_policy.FlushedSettings(); grpc_core::global_stats().IncrementHttp2SettingsWrites(); } } @@ -297,10 +289,9 @@ class WriteContext { uint32_t transport_announce = t_->flow_control.MaybeSendUpdate( t_->outbuf.c_slice_buffer()->count > 0); if (transport_announce) { - grpc_transport_one_way_stats throwaway_stats; - grpc_slice_buffer_add(t_->outbuf.c_slice_buffer(), - grpc_chttp2_window_update_create( - 0, transport_announce, &throwaway_stats)); + grpc_slice_buffer_add( + t_->outbuf.c_slice_buffer(), + grpc_chttp2_window_update_create(0, transport_announce, nullptr)); grpc_chttp2_reset_ping_clock(t_); } } @@ -412,7 +403,7 @@ class DataSendContext { s_->send_trailing_metadata != nullptr && s_->send_trailing_metadata->empty(); grpc_chttp2_encode_data(s_->id, &s_->flow_controlled_buffer, send_bytes, - is_last_frame_, &s_->stats.outgoing, + is_last_frame_, &s_->call_tracer_wrapper, t_->outbuf.c_slice_buffer()); sfc_upd_.SentData(send_bytes); s_->sending_bytes += send_bytes; @@ -443,10 +434,10 @@ class StreamWriteContext { public: StreamWriteContext(WriteContext* write_context, grpc_chttp2_stream* s) : write_context_(write_context), t_(write_context->transport()), s_(s) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "W:%p %s[%d] im-(sent,send)=(%d,%d)", t_, - t_->is_client ? "CLIENT" : "SERVER", s->id, - s->sent_initial_metadata, s->send_initial_metadata != nullptr)); + GRPC_CHTTP2_IF_TRACING(INFO) + << "W:" << t_ << " " << (t_->is_client ? "CLIENT" : "SERVER") << "[" + << s->id << "] im-(sent,send)=(" << s->sent_initial_metadata << "," + << (s->send_initial_metadata != nullptr) << ")"; } void FlushInitialMetadata() { @@ -471,8 +462,7 @@ class StreamWriteContext { t_->settings.peer() .allow_true_binary_metadata(), // use_true_binary_metadata t_->settings.peer().max_frame_size(), // max_frame_size - &s_->stats.outgoing // stats - }, + &s_->call_tracer_wrapper}, *s_->send_initial_metadata, t_->outbuf.c_slice_buffer()); grpc_chttp2_reset_ping_clock(t_); write_context_->IncInitialMetadataWrites(); @@ -484,16 +474,32 @@ class StreamWriteContext { grpc_chttp2_complete_closure_step(t_, &s_->send_initial_metadata_finished, absl::OkStatus(), "send_initial_metadata_finished"); - if (s_->call_tracer) { - grpc_core::HttpAnnotation::WriteStats write_stats; - write_stats.target_write_size = write_context_->target_write_size(); - s_->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation( - grpc_core::HttpAnnotation::Type::kHeadWritten, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s_->t->flow_control.stats()) - .Add(s_->flow_control.stats()) - .Add(write_stats)); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s_->call_tracer) { + grpc_core::HttpAnnotation::WriteStats write_stats; + write_stats.target_write_size = write_context_->target_write_size(); + s_->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation( + grpc_core::HttpAnnotation::Type::kHeadWritten, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats()) + .Add(write_stats)); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = + s_->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + grpc_core::HttpAnnotation::WriteStats write_stats; + write_stats.target_write_size = write_context_->target_write_size(); + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation( + grpc_core::HttpAnnotation::Type::kHeadWritten, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats()) + .Add(write_stats)); + } } } @@ -504,9 +510,10 @@ class StreamWriteContext { const uint32_t stream_announce = s_->flow_control.MaybeSendUpdate(); if (stream_announce == 0) return; - grpc_slice_buffer_add(t_->outbuf.c_slice_buffer(), - grpc_chttp2_window_update_create( - s_->id, stream_announce, &s_->stats.outgoing)); + grpc_slice_buffer_add( + t_->outbuf.c_slice_buffer(), + grpc_chttp2_window_update_create(s_->id, stream_announce, + &s_->call_tracer_wrapper)); grpc_chttp2_reset_ping_clock(t_); write_context_->IncWindowUpdateWrites(); } @@ -556,15 +563,16 @@ class StreamWriteContext { if (s_->send_trailing_metadata == nullptr) return; if (s_->flow_controlled_buffer.length != 0) return; - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "sending trailing_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "sending trailing_metadata"; if (s_->send_trailing_metadata->empty()) { grpc_chttp2_encode_data(s_->id, &s_->flow_controlled_buffer, 0, true, - &s_->stats.outgoing, t_->outbuf.c_slice_buffer()); + &s_->call_tracer_wrapper, + t_->outbuf.c_slice_buffer()); } else { t_->hpack_compressor.EncodeHeaders( grpc_core::HPackCompressor::EncodeHeaderOptions{ s_->id, true, t_->settings.peer().allow_true_binary_metadata(), - t_->settings.peer().max_frame_size(), &s_->stats.outgoing}, + t_->settings.peer().max_frame_size(), &s_->call_tracer_wrapper}, *s_->send_trailing_metadata, t_->outbuf.c_slice_buffer()); } write_context_->IncTrailingMetadataWrites(); @@ -607,8 +615,8 @@ class StreamWriteContext { }; void ConvertInitialMetadataToTrailingMetadata() { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "not sending initial_metadata (Trailers-Only)")); + GRPC_CHTTP2_IF_TRACING(INFO) + << "not sending initial_metadata (Trailers-Only)"; // When sending Trailers-Only, we need to move metadata from headers to // trailers. TrailersOnlyMetadataEncoder encoder(s_->send_trailing_metadata); @@ -628,16 +636,28 @@ class StreamWriteContext { grpc_slice_buffer_add( t_->outbuf.c_slice_buffer(), grpc_chttp2_rst_stream_create(s_->id, GRPC_HTTP2_NO_ERROR, - &s_->stats.outgoing)); + &s_->call_tracer_wrapper)); } grpc_chttp2_mark_stream_closed(t_, s_, !t_->is_client, true, absl::OkStatus()); - if (s_->call_tracer) { - s_->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s_->t->flow_control.stats()) - .Add(s_->flow_control.stats())); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s_->call_tracer) { + s_->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats())); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = + s_->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats())); + } } } @@ -650,6 +670,8 @@ class StreamWriteContext { grpc_chttp2_begin_write_result grpc_chttp2_begin_write( grpc_chttp2_transport* t) { + GRPC_LATENT_SEE_INNER_SCOPE("grpc_chttp2_begin_write"); + int64_t outbuf_relative_start_pos = 0; WriteContext ctx(t); ctx.FlushSettings(); @@ -676,7 +698,7 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( num_stream_bytes = t->outbuf.c_slice_buffer()->length - orig_len; s->byte_counter += static_cast(num_stream_bytes); ++s->write_counter; - if (s->traced && grpc_endpoint_can_track_err(t->ep)) { + if (s->traced && grpc_endpoint_can_track_err(t->ep.get())) { grpc_core::CopyContextFn copy_context_fn = grpc_core::GrpcHttp2GetCopyContextFn(); if (copy_context_fn != nullptr && @@ -705,12 +727,17 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( maybe_initiate_ping(t); + t->write_flow.Begin(GRPC_LATENT_SEE_METADATA("write")); + return ctx.Result(); } void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { + GRPC_LATENT_SEE_INNER_SCOPE("grpc_chttp2_end_write"); grpc_chttp2_stream* s; + t->write_flow.End(); + if (t->channelz_socket != nullptr) { t->channelz_socket->RecordMessagesSent(t->num_messages_in_next_write); } @@ -728,10 +755,9 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { grpc_chttp2_ping_timeout(t); }); if (GRPC_TRACE_FLAG_ENABLED(http2_ping) && id.has_value()) { - gpr_log(GPR_INFO, - "%s[%p]: Set ping timeout timer of %s for ping id %" PRIx64, - t->is_client ? "CLIENT" : "SERVER", t, timeout.ToString().c_str(), - id.value()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Set ping timeout timer of " << timeout.ToString() + << " for ping id " << id.value(); } if (t->keepalive_incoming_data_wanted && @@ -741,9 +767,9 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { kInvalid) { if (GRPC_TRACE_FLAG_ENABLED(http2_ping) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s[%p]: Set keepalive ping timeout timer of %s", - t->is_client ? "CLIENT" : "SERVER", t, - t->keepalive_timeout.ToString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Set keepalive ping timeout timer of " + << t->keepalive_timeout.ToString(); } t->keepalive_ping_timeout_handle = t->event_engine->RunAfter(t->keepalive_timeout, [t = t->Ref()] { diff --git a/deps/grpc/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/deps/grpc/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 60e277cb71..d78069c312 100644 --- a/deps/grpc/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/deps/grpc/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -18,10 +18,10 @@ #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include -#include #include #include "src/core/ext/transport/cronet/transport/cronet_transport.h" @@ -38,9 +38,8 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( void* engine, const char* target, const grpc_channel_args* args, void* reserved) { - gpr_log(GPR_DEBUG, - "grpc_create_cronet_transport: stream_engine = %p, target=%s", engine, - target); + VLOG(2) << "grpc_create_cronet_transport: stream_engine = " << engine + << ", target=" << target; // Disable client authority filter when using Cronet auto channel_args = grpc_core::CoreConfiguration::Get() diff --git a/deps/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc b/deps/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc index 57afb81146..f0befc2faa 100644 --- a/deps/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc +++ b/deps/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc @@ -22,7 +22,6 @@ #include "absl/log/check.h" #include "third_party/objective_c/Cronet/bidirectional_stream_c.h" -#include #include #ifdef GRPC_COMPILE_WITH_CRONET diff --git a/deps/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc b/deps/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc index b5be87ea63..26b0938228 100644 --- a/deps/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/deps/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -39,7 +40,6 @@ #include #include #include -#include #include #include @@ -67,11 +67,6 @@ #define GRPC_HEADER_SIZE_IN_BYTES 5 #define GRPC_FLUSH_READ_SIZE 4096 -#define CRONET_LOG(...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(cronet)) gpr_log(__VA_ARGS__); \ - } while (0) - enum e_op_result { ACTION_TAKEN_WITH_CALLBACK, ACTION_TAKEN_NO_CALLBACK, @@ -327,7 +322,7 @@ static void read_grpc_header(stream_obj* s) { s->state.rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; s->state.rs.received_bytes = 0; s->state.rs.compressed = false; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) << "bidirectional_stream_read(" << s->cbs << ")"; bidirectional_stream_read(s->cbs, s->state.rs.read_buffer, s->state.rs.remaining_bytes); } @@ -365,8 +360,8 @@ static void add_to_storage(struct stream_obj* s, if (op->recv_trailing_metadata) { s->state.pending_recv_trailing_metadata = true; } - CRONET_LOG(GPR_DEBUG, "adding new op %p. %d in the queue.", new_op, - storage->num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) << "adding new op " << new_op << ". " + << storage->num_pending_ops << " in the queue."; gpr_mu_unlock(&s->mu); } @@ -383,19 +378,21 @@ static void remove_from_storage(struct stream_obj* s, s->storage.head = oas->next; delete oas; s->storage.num_pending_ops--; - CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, - s->storage.num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) << "Freed " << oas << ". Now " + << s->storage.num_pending_ops << " in the queue"; } else { for (curr = s->storage.head; curr != nullptr; curr = curr->next) { if (curr->next == oas) { curr->next = oas->next; s->storage.num_pending_ops--; - CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, - s->storage.num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) + << "Freed " << oas << ". Now " << s->storage.num_pending_ops + << " in the queue"; delete oas; break; } else if (GPR_UNLIKELY(curr->next == nullptr)) { - CRONET_LOG(GPR_ERROR, "Reached end of LL and did not find op to free"); + GRPC_TRACE_LOG(cronet, ERROR) + << "Reached end of LL and did not find op to free"; } } } @@ -410,11 +407,12 @@ static void remove_from_storage(struct stream_obj* s, static void execute_from_storage(stream_obj* s) { gpr_mu_lock(&s->mu); for (struct op_and_state* curr = s->storage.head; curr != nullptr;) { - CRONET_LOG(GPR_DEBUG, "calling op at %p. done = %d", curr, curr->done); + GRPC_TRACE_VLOG(cronet, 2) + << "calling op at " << curr << ". done = " << curr->done; CHECK(!curr->done); enum e_op_result result = execute_stream_op(curr); - CRONET_LOG(GPR_DEBUG, "execute_stream_op[%p] returns %s", curr, - op_result_string(result)); + GRPC_TRACE_VLOG(cronet, 2) << "execute_stream_op[" << curr << "] returns " + << op_result_string(result); // if this op is done, then remove it and free memory if (curr->done) { struct op_and_state* next = curr->next; @@ -434,8 +432,8 @@ static void convert_cronet_array_to_metadata( const bidirectional_stream_header_array* header_array, grpc_metadata_batch* mds) { for (size_t i = 0; i < header_array->count; i++) { - CRONET_LOG(GPR_DEBUG, "header key=%s, value=%s", - header_array->headers[i].key, header_array->headers[i].value); + GRPC_TRACE_VLOG(cronet, 2) << "header key=" << header_array->headers[i].key + << ", value=" << header_array->headers[i].value; grpc_slice value; if (absl::EndsWith(header_array->headers[i].key, "-bin")) { value = grpc_slice_from_static_string(header_array->headers[i].value); @@ -446,11 +444,9 @@ static void convert_cronet_array_to_metadata( } mds->Append(header_array->headers[i].key, grpc_core::Slice(value), [&](absl::string_view error, const grpc_core::Slice& value) { - gpr_log(GPR_DEBUG, "Failed to parse metadata: %s", - absl::StrCat("key=", header_array->headers[i].key, - " error=", error, - " value=", value.as_string_view()) - .c_str()); + VLOG(2) << "Failed to parse metadata: key=" + << header_array->headers[i].key << " error=" << error + << " value=" << value.as_string_view(); }); } } @@ -459,7 +455,7 @@ static void convert_cronet_array_to_metadata( // Cronet callback // static void on_failed(bidirectional_stream* stream, int net_error) { - gpr_log(GPR_ERROR, "on_failed(%p, %d)", stream, net_error); + LOG(ERROR) << "on_failed(" << stream << ", " << net_error << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -487,7 +483,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { // Cronet callback // static void on_canceled(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "on_canceled(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -514,7 +510,7 @@ static void on_canceled(bidirectional_stream* stream) { // Cronet callback // static void on_succeeded(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "on_succeeded(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -533,7 +529,7 @@ static void on_succeeded(bidirectional_stream* stream) { // Cronet callback // static void on_stream_ready(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "W: on_stream_ready(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); @@ -550,7 +546,8 @@ static void on_stream_ready(bidirectional_stream* stream) { // SEND_TRAILING_METADATA ops pending if (t->use_packet_coalescing) { if (s->state.flush_cronet_when_ready) { - CRONET_LOG(GPR_DEBUG, "cronet_bidirectional_stream_flush (%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "cronet_bidirectional_stream_flush (" << s->cbs << ")"; bidirectional_stream_flush(stream); } } @@ -567,8 +564,9 @@ static void on_response_headers_received( const char* negotiated_protocol) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, - headers, negotiated_protocol); + GRPC_TRACE_VLOG(cronet, 2) + << "R: on_response_headers_received(" << stream << ", " << headers << ", " + << negotiated_protocol << ")"; stream_obj* s = static_cast(stream->annotation); // Identify if this is a header or a trailer (in a trailer-only response case) @@ -605,7 +603,8 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); - CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); + GRPC_TRACE_VLOG(cronet, 2) + << "W: on_write_completed(" << stream << ", " << data << ")"; gpr_mu_lock(&s->mu); if (s->state.ws.write_buffer) { gpr_free(s->state.ws.write_buffer); @@ -624,12 +623,12 @@ static void on_read_completed(bidirectional_stream* stream, char* data, grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); - CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, - count); + GRPC_TRACE_VLOG(cronet, 2) << "R: on_read_completed(" << stream << ", " + << data << ", " << count << ")"; gpr_mu_lock(&s->mu); s->state.state_callback_received[OP_RECV_MESSAGE] = true; if (count > 0 && s->state.flush_read) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) << "bidirectional_stream_read(" << s->cbs << ")"; bidirectional_stream_read(s->cbs, s->state.rs.read_buffer, GRPC_FLUSH_READ_SIZE); gpr_mu_unlock(&s->mu); @@ -637,7 +636,8 @@ static void on_read_completed(bidirectional_stream* stream, char* data, s->state.rs.received_bytes += count; s->state.rs.remaining_bytes -= count; if (s->state.rs.remaining_bytes > 0) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; s->state.state_op_done[OP_READ_REQ_MADE] = true; bidirectional_stream_read( s->cbs, s->state.rs.read_buffer + s->state.rs.received_bytes, @@ -663,8 +663,8 @@ static void on_response_trailers_received( const bidirectional_stream_header_array* trailers) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, - trailers); + GRPC_TRACE_VLOG(cronet, 2) << "R: on_response_trailers_received(" << stream + << ", " << trailers << ")"; stream_obj* s = static_cast(stream->annotation); grpc_cronet_transport* t = s->curr_ct; gpr_mu_lock(&s->mu); @@ -679,11 +679,13 @@ static void on_response_trailers_received( if (!s->state.state_op_done[OP_SEND_TRAILING_METADATA] && !(s->state.state_op_done[OP_CANCEL_ERROR] || s->state.state_callback_received[OP_FAILED])) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, 0)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", 0)"; s->state.state_callback_received[OP_SEND_MESSAGE] = false; bidirectional_stream_write(s->cbs, "", 0, true); if (t->use_packet_coalescing) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; bidirectional_stream_flush(s->cbs); } s->state.state_op_done[OP_SEND_TRAILING_METADATA] = true; @@ -792,7 +794,7 @@ class CronetMetadataEncoder { } else { value = grpc_slice_to_c_string(value_slice.c_slice()); } - CRONET_LOG(GPR_DEBUG, "header %s = %s", key, value); + GRPC_TRACE_VLOG(cronet, 2) << "header " << key << " = " << value; CHECK_LT(count_, capacity_); headers_[count_].key = key; headers_[count_].value = value; @@ -854,34 +856,34 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, stream_state->state_callback_received[OP_FAILED]; if (is_canceled_or_failed) { if (op_id == OP_SEND_INITIAL_METADATA) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_SEND_MESSAGE) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_SEND_TRAILING_METADATA) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_CANCEL_ERROR) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // already executed if (op_id == OP_RECV_INITIAL_METADATA && stream_state->state_op_done[OP_RECV_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_RECV_MESSAGE && op_state->state_op_done[OP_RECV_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_RECV_TRAILING_METADATA && stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // ON_COMPLETE can be processed if one of the following conditions is met: @@ -894,7 +896,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, stream_state->state_callback_received[OP_CANCELED] || stream_state->state_callback_received[OP_SUCCEEDED] || !stream_state->state_op_done[OP_SEND_INITIAL_METADATA])) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } } else if (op_id == OP_SEND_INITIAL_METADATA) { @@ -976,7 +978,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, if (op_state->state_op_done[OP_ON_COMPLETE]) { // already executed (note we're checking op specific state, not stream // state) - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // Check if every op that was asked for is done. @@ -986,36 +988,36 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, // there are still recv ops pending. else if (curr_op->send_initial_metadata && !stream_state->state_callback_received[OP_SEND_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_message && !op_state->state_op_done[OP_SEND_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_message && !stream_state->state_callback_received[OP_SEND_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_trailing_metadata && !stream_state->state_op_done[OP_SEND_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_initial_metadata && !stream_state->state_op_done[OP_RECV_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_message && !op_state->state_op_done[OP_RECV_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->cancel_stream && !stream_state->state_callback_received[OP_CANCELED]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_trailing_metadata) { // We aren't done with trailing metadata yet if (!stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // We've asked for actual message in an earlier op, and it hasn't been @@ -1025,7 +1027,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, // op has asked), and the read hasn't been delivered. if (!curr_op->recv_message && !stream_state->state_callback_received[OP_SUCCEEDED]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } } @@ -1037,357 +1039,445 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, result = false; } } - CRONET_LOG(GPR_DEBUG, "op_can_be_run %s : %s", op_id_string(op_id), - result ? "YES" : "NO"); + GRPC_TRACE_VLOG(cronet, 2) << "op_can_be_run " << op_id_string(op_id) << " : " + << (result ? "YES" : "NO"); return result; } -// -// TODO (makdharma): Break down this function in smaller chunks for readability. -// -static enum e_op_result execute_stream_op(struct op_and_state* oas) { +static enum e_op_result execute_stream_op_send_initial_metadata( + struct op_and_state* oas) { grpc_transport_stream_op_batch* stream_op = &oas->op; struct stream_obj* s = oas->s; grpc_cronet_transport* t = s->curr_ct; struct op_state* stream_state = &s->state; - enum e_op_result result = NO_ACTION_POSSIBLE; - if (stream_op->send_initial_metadata && - op_can_be_run(stream_op, s, &oas->state, OP_SEND_INITIAL_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_INITIAL_METADATA", oas); - // Start new cronet stream. It is destroyed in on_succeeded, on_canceled, - // on_failed - CHECK_EQ(s->cbs, nullptr); - CHECK(!stream_state->state_op_done[OP_SEND_INITIAL_METADATA]); - s->cbs = - bidirectional_stream_create(t->engine, s->curr_gs, &cronet_callbacks); - CRONET_LOG(GPR_DEBUG, "%p = bidirectional_stream_create()", s->cbs); - if (t->use_packet_coalescing) { - bidirectional_stream_disable_auto_flush(s->cbs, true); - bidirectional_stream_delay_request_headers_until_flush(s->cbs, true); - } - std::string url; - const char* method = "POST"; - s->header_array.headers = nullptr; - convert_metadata_to_cronet_headers( - stream_op->payload->send_initial_metadata.send_initial_metadata, - t->host, &url, &s->header_array.headers, &s->header_array.count, - &method); - s->header_array.capacity = s->header_array.count; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_start(%p, %s)", s->cbs, - url.c_str()); - bidirectional_stream_start(s->cbs, url.c_str(), 0, method, &s->header_array, - false); - unsigned int header_index; - for (header_index = 0; header_index < s->header_array.count; - header_index++) { - gpr_free(const_cast(s->header_array.headers[header_index].key)); - gpr_free(const_cast(s->header_array.headers[header_index].value)); - } - stream_state->state_op_done[OP_SEND_INITIAL_METADATA] = true; - if (t->use_packet_coalescing) { - if (!stream_op->send_message && !stream_op->send_trailing_metadata) { - s->state.flush_cronet_when_ready = true; - } + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_SEND_INITIAL_METADATA"; + // Start new cronet stream. It is destroyed in on_succeeded, on_canceled, + // on_failed + CHECK_EQ(s->cbs, nullptr); + CHECK(!stream_state->state_op_done[OP_SEND_INITIAL_METADATA]); + s->cbs = + bidirectional_stream_create(t->engine, s->curr_gs, &cronet_callbacks); + GRPC_TRACE_VLOG(cronet, 2) << s->cbs << " = bidirectional_stream_create()"; + if (t->use_packet_coalescing) { + bidirectional_stream_disable_auto_flush(s->cbs, true); + bidirectional_stream_delay_request_headers_until_flush(s->cbs, true); + } + std::string url; + const char* method = "POST"; + s->header_array.headers = nullptr; + convert_metadata_to_cronet_headers( + stream_op->payload->send_initial_metadata.send_initial_metadata, t->host, + &url, &s->header_array.headers, &s->header_array.count, &method); + s->header_array.capacity = s->header_array.count; + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_start(" << s->cbs << ", " << url.c_str() << ")"; + bidirectional_stream_start(s->cbs, url.c_str(), 0, method, &s->header_array, + false); + unsigned int header_index; + for (header_index = 0; header_index < s->header_array.count; header_index++) { + gpr_free(const_cast(s->header_array.headers[header_index].key)); + gpr_free(const_cast(s->header_array.headers[header_index].value)); + } + stream_state->state_op_done[OP_SEND_INITIAL_METADATA] = true; + if (t->use_packet_coalescing) { + if (!stream_op->send_message && !stream_op->send_trailing_metadata) { + s->state.flush_cronet_when_ready = true; } - result = ACTION_TAKEN_WITH_CALLBACK; - } else if (stream_op->send_message && - op_can_be_run(stream_op, s, &oas->state, OP_SEND_MESSAGE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_MESSAGE", oas); - stream_state->pending_send_message = false; - if (stream_state->state_op_done[OP_CANCEL_ERROR] || - stream_state->state_callback_received[OP_FAILED] || - stream_state->state_callback_received[OP_SUCCEEDED]) { - result = NO_ACTION_POSSIBLE; - CRONET_LOG(GPR_DEBUG, "Stream is either cancelled, failed or finished"); - } else { - size_t write_buffer_size; - create_grpc_frame( - stream_op->payload->send_message.send_message->c_slice_buffer(), - &stream_state->ws.write_buffer, &write_buffer_size, - stream_op->payload->send_message.flags); - if (write_buffer_size > 0) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, %p)", s->cbs, - stream_state->ws.write_buffer); - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, - static_cast(write_buffer_size), false); - if (t->use_packet_coalescing) { - if (!stream_op->send_trailing_metadata) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); - bidirectional_stream_flush(s->cbs); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - stream_state->pending_write_for_trailer = true; - result = ACTION_TAKEN_NO_CALLBACK; - } - } else { + } + return ACTION_TAKEN_WITH_CALLBACK; +} + +static enum e_op_result execute_stream_op_send_message( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + grpc_cronet_transport* t = s->curr_ct; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_SEND_MESSAGE"; + stream_state->pending_send_message = false; + if (stream_state->state_op_done[OP_CANCEL_ERROR] || + stream_state->state_callback_received[OP_FAILED] || + stream_state->state_callback_received[OP_SUCCEEDED]) { + result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "Stream is either cancelled, failed or finished"; + } else { + size_t write_buffer_size; + create_grpc_frame( + stream_op->payload->send_message.send_message->c_slice_buffer(), + &stream_state->ws.write_buffer, &write_buffer_size, + stream_op->payload->send_message.flags); + if (write_buffer_size > 0) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", " + << stream_state->ws.write_buffer << ")"; + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, + static_cast(write_buffer_size), false); + if (t->use_packet_coalescing) { + if (!stream_op->send_trailing_metadata) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; + bidirectional_stream_flush(s->cbs); result = ACTION_TAKEN_WITH_CALLBACK; + } else { + stream_state->pending_write_for_trailer = true; + result = ACTION_TAKEN_NO_CALLBACK; } } else { - // Should never reach here - grpc_core::Crash("unreachable"); + result = ACTION_TAKEN_WITH_CALLBACK; } - } - stream_state->state_op_done[OP_SEND_MESSAGE] = true; - oas->state.state_op_done[OP_SEND_MESSAGE] = true; - } else if (stream_op->send_trailing_metadata && - op_can_be_run(stream_op, s, &oas->state, - OP_SEND_TRAILING_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_TRAILING_METADATA", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR] || - stream_state->state_callback_received[OP_FAILED] || - stream_state->state_callback_received[OP_SUCCEEDED]) { - result = NO_ACTION_POSSIBLE; - CRONET_LOG(GPR_DEBUG, "Stream is either cancelled, failed or finished"); } else { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, 0)", s->cbs); - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - bidirectional_stream_write(s->cbs, "", 0, true); - if (t->use_packet_coalescing) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); - bidirectional_stream_flush(s->cbs); - } - result = ACTION_TAKEN_WITH_CALLBACK; + // Should never reach here + grpc_core::Crash("unreachable"); } - stream_state->state_op_done[OP_SEND_TRAILING_METADATA] = true; - } else if (stream_op->recv_initial_metadata && - op_can_be_run(stream_op, s, &oas->state, - OP_RECV_INITIAL_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else if (stream_state->state_callback_received[OP_FAILED]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else { - *stream_op->payload->recv_initial_metadata.recv_initial_metadata = - std::move(oas->s->state.rs.initial_metadata); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); + } + stream_state->state_op_done[OP_SEND_MESSAGE] = true; + oas->state.state_op_done[OP_SEND_MESSAGE] = true; + + return result; +} + +static enum e_op_result execute_stream_op_send_trailing_metadata( + struct op_and_state* oas) { + struct stream_obj* s = oas->s; + grpc_cronet_transport* t = s->curr_ct; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_SEND_TRAILING_METADATA"; + if (stream_state->state_op_done[OP_CANCEL_ERROR] || + stream_state->state_callback_received[OP_FAILED] || + stream_state->state_callback_received[OP_SUCCEEDED]) { + result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "Stream is either cancelled, failed or finished"; + } else { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", 0)"; + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + bidirectional_stream_write(s->cbs, "", 0, true); + if (t->use_packet_coalescing) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; + bidirectional_stream_flush(s->cbs); } - stream_state->state_op_done[OP_RECV_INITIAL_METADATA] = true; + result = ACTION_TAKEN_WITH_CALLBACK; + } + stream_state->state_op_done[OP_SEND_TRAILING_METADATA] = true; + + return result; +} + +static enum e_op_result execute_stream_op_recv_initial_metadata( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_RECV_INITIAL_METADATA"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else if (stream_state->state_callback_received[OP_FAILED]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else { + *stream_op->payload->recv_initial_metadata.recv_initial_metadata = + std::move(oas->s->state.rs.initial_metadata); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } + stream_state->state_op_done[OP_RECV_INITIAL_METADATA] = true; + return ACTION_TAKEN_NO_CALLBACK; +} + +static enum e_op_result execute_stream_op_recv_message( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_RECV_MESSAGE"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + GRPC_TRACE_VLOG(cronet, 2) << "Stream is cancelled."; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_op->recv_message && - op_can_be_run(stream_op, s, &oas->state, OP_RECV_MESSAGE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_state->state_callback_received[OP_FAILED]) { - CRONET_LOG(GPR_DEBUG, "Stream failed."); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_state->rs.read_stream_closed) { - // No more data will be received - CRONET_LOG(GPR_DEBUG, "read stream closed"); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_state->flush_read) { - CRONET_LOG(GPR_DEBUG, "flush read"); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - result = ACTION_TAKEN_NO_CALLBACK; - } else if (!stream_state->rs.length_field_received) { - if (stream_state->rs.received_bytes == GRPC_HEADER_SIZE_IN_BYTES && - stream_state->rs.remaining_bytes == 0) { - // Start a read operation for data - stream_state->rs.length_field_received = true; - parse_grpc_header( - reinterpret_cast(stream_state->rs.read_buffer), - &stream_state->rs.length_field, &stream_state->rs.compressed); - CRONET_LOG(GPR_DEBUG, "length field = %d", - stream_state->rs.length_field); - if (stream_state->rs.length_field > 0) { - stream_state->rs.read_buffer = static_cast( - gpr_malloc(static_cast(stream_state->rs.length_field))); - CHECK(stream_state->rs.read_buffer); - stream_state->rs.remaining_bytes = stream_state->rs.length_field; - stream_state->rs.received_bytes = 0; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); - stream_state->state_op_done[OP_READ_REQ_MADE] = - true; // Indicates that at least one read request has been made - bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, - stream_state->rs.remaining_bytes); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - stream_state->rs.remaining_bytes = 0; - CRONET_LOG(GPR_DEBUG, "read operation complete. Empty response."); - // Clean up read_slice_buffer in case there is unread data. - stream_state->rs.read_slice_buffer.Clear(); - uint32_t flags = 0; - if (stream_state->rs.compressed) { - flags |= GRPC_WRITE_INTERNAL_COMPRESS; - } - *stream_op->payload->recv_message.flags = flags; - *stream_op->payload->recv_message.recv_message = - std::move(stream_state->rs.read_slice_buffer); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - - // Extra read to trigger on_succeed - stream_state->rs.length_field_received = false; - stream_state->state_op_done[OP_READ_REQ_MADE] = - true; // Indicates that at least one read request has been made - read_grpc_header(s); - result = ACTION_TAKEN_NO_CALLBACK; - } - } else if (stream_state->rs.remaining_bytes == 0) { - // Start a read operation for first 5 bytes (GRPC header) - stream_state->rs.read_buffer = stream_state->rs.grpc_header_bytes; - stream_state->rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; + } else if (stream_state->state_callback_received[OP_FAILED]) { + GRPC_TRACE_VLOG(cronet, 2) << "Stream failed."; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + result = ACTION_TAKEN_NO_CALLBACK; + } else if (stream_state->rs.read_stream_closed) { + // No more data will be received + GRPC_TRACE_VLOG(cronet, 2) << "read stream closed"; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + result = ACTION_TAKEN_NO_CALLBACK; + } else if (stream_state->flush_read) { + GRPC_TRACE_VLOG(cronet, 2) << "flush read"; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + result = ACTION_TAKEN_NO_CALLBACK; + } else if (!stream_state->rs.length_field_received) { + if (stream_state->rs.received_bytes == GRPC_HEADER_SIZE_IN_BYTES && + stream_state->rs.remaining_bytes == 0) { + // Start a read operation for data + stream_state->rs.length_field_received = true; + parse_grpc_header( + reinterpret_cast(stream_state->rs.read_buffer), + &stream_state->rs.length_field, &stream_state->rs.compressed); + GRPC_TRACE_VLOG(cronet, 2) + << "length field = " << stream_state->rs.length_field; + if (stream_state->rs.length_field > 0) { + stream_state->rs.read_buffer = static_cast( + gpr_malloc(static_cast(stream_state->rs.length_field))); + CHECK(stream_state->rs.read_buffer); + stream_state->rs.remaining_bytes = stream_state->rs.length_field; stream_state->rs.received_bytes = 0; - stream_state->rs.compressed = false; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; stream_state->state_op_done[OP_READ_REQ_MADE] = true; // Indicates that at least one read request has been made bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, stream_state->rs.remaining_bytes); result = ACTION_TAKEN_WITH_CALLBACK; } else { - result = NO_ACTION_POSSIBLE; + stream_state->rs.remaining_bytes = 0; + GRPC_TRACE_VLOG(cronet, 2) + << "read operation complete. Empty response."; + // Clean up read_slice_buffer in case there is unread data. + stream_state->rs.read_slice_buffer.Clear(); + uint32_t flags = 0; + if (stream_state->rs.compressed) { + flags |= GRPC_WRITE_INTERNAL_COMPRESS; + } + *stream_op->payload->recv_message.flags = flags; + *stream_op->payload->recv_message.recv_message = + std::move(stream_state->rs.read_slice_buffer); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + + // Extra read to trigger on_succeed + stream_state->rs.length_field_received = false; + stream_state->state_op_done[OP_READ_REQ_MADE] = + true; // Indicates that at least one read request has been made + read_grpc_header(s); + result = ACTION_TAKEN_NO_CALLBACK; } } else if (stream_state->rs.remaining_bytes == 0) { - CRONET_LOG(GPR_DEBUG, "read operation complete"); - grpc_slice read_data_slice = - GRPC_SLICE_MALLOC((uint32_t)stream_state->rs.length_field); - uint8_t* dst_p = GRPC_SLICE_START_PTR(read_data_slice); - memcpy(dst_p, stream_state->rs.read_buffer, - static_cast(stream_state->rs.length_field)); - null_and_maybe_free_read_buffer(s); - // Clean up read_slice_buffer in case there is unread data. - stream_state->rs.read_slice_buffer.Clear(); - stream_state->rs.read_slice_buffer.Append( - grpc_core::Slice(read_data_slice)); - uint32_t flags = 0; - if (stream_state->rs.compressed) { - flags = GRPC_WRITE_INTERNAL_COMPRESS; - } - *stream_op->payload->recv_message.flags = flags; - *stream_op->payload->recv_message.recv_message = - std::move(stream_state->rs.read_slice_buffer); + // Start a read operation for first 5 bytes (GRPC header) + stream_state->rs.read_buffer = stream_state->rs.grpc_header_bytes; + stream_state->rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; + stream_state->rs.received_bytes = 0; + stream_state->rs.compressed = false; + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; + stream_state->state_op_done[OP_READ_REQ_MADE] = + true; // Indicates that at least one read request has been made + bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, + stream_state->rs.remaining_bytes); + result = ACTION_TAKEN_WITH_CALLBACK; + } else { + result = NO_ACTION_POSSIBLE; + } + } else if (stream_state->rs.remaining_bytes == 0) { + GRPC_TRACE_VLOG(cronet, 2) << "read operation complete"; + grpc_slice read_data_slice = + GRPC_SLICE_MALLOC((uint32_t)stream_state->rs.length_field); + uint8_t* dst_p = GRPC_SLICE_START_PTR(read_data_slice); + memcpy(dst_p, stream_state->rs.read_buffer, + static_cast(stream_state->rs.length_field)); + null_and_maybe_free_read_buffer(s); + // Clean up read_slice_buffer in case there is unread data. + stream_state->rs.read_slice_buffer.Clear(); + stream_state->rs.read_slice_buffer.Append( + grpc_core::Slice(read_data_slice)); + uint32_t flags = 0; + if (stream_state->rs.compressed) { + flags = GRPC_WRITE_INTERNAL_COMPRESS; + } + *stream_op->payload->recv_message.flags = flags; + *stream_op->payload->recv_message.recv_message = + std::move(stream_state->rs.read_slice_buffer); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + // Do an extra read to trigger on_succeeded() callback in case connection + // is closed + stream_state->rs.length_field_received = false; + read_grpc_header(s); + result = ACTION_TAKEN_NO_CALLBACK; + } + return result; +} + +static enum e_op_result execute_stream_op_recv_trailing_metadata( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_RECV_TRAILING_METADATA"; + grpc_error_handle error; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + error = stream_state->cancel_error; + } else if (stream_state->state_callback_received[OP_FAILED]) { + grpc_status_code grpc_error_code = + cronet_net_error_to_grpc_error(stream_state->net_error); + const char* desc = cronet_net_error_as_string(stream_state->net_error); + error = + make_error_with_desc(grpc_error_code, stream_state->net_error, desc); + } else if (oas->s->state.rs.trailing_metadata_valid) { + *stream_op->payload->recv_trailing_metadata.recv_trailing_metadata = + std::move(oas->s->state.rs.trailing_metadata); + stream_state->rs.trailing_metadata_valid = false; + } + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, + error); + stream_state->state_op_done[OP_RECV_TRAILING_METADATA] = true; + + return ACTION_TAKEN_NO_CALLBACK; +} + +static enum e_op_result execute_stream_op_cancel_stream( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_CANCEL_ERROR"; + if (s->cbs) { + GRPC_TRACE_VLOG(cronet, 2) + << "W: bidirectional_stream_cancel(" << s->cbs << ")"; + bidirectional_stream_cancel(s->cbs); + result = ACTION_TAKEN_WITH_CALLBACK; + } else { + result = ACTION_TAKEN_NO_CALLBACK; + } + stream_state->state_op_done[OP_CANCEL_ERROR] = true; + if (stream_state->cancel_error.ok()) { + stream_state->cancel_error = stream_op->payload->cancel_stream.cancel_error; + } + + return result; +} + +static enum e_op_result execute_stream_op_on_complete( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_ON_COMPLETE"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + if (stream_op->on_complete) { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + stream_state->cancel_error); + } + } else if (stream_state->state_callback_received[OP_FAILED]) { + if (stream_op->on_complete) { + const char* error_message = + cronet_net_error_as_string(stream_state->net_error); + grpc_status_code grpc_error_code = + cronet_net_error_to_grpc_error(stream_state->net_error); grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - // Do an extra read to trigger on_succeeded() callback in case connection - // is closed - stream_state->rs.length_field_received = false; - read_grpc_header(s); - result = ACTION_TAKEN_NO_CALLBACK; + DEBUG_LOCATION, stream_op->on_complete, + make_error_with_desc(grpc_error_code, stream_state->net_error, + error_message)); } + } else { + // All actions in this stream_op are complete. Call the on_complete + // callback + // + if (stream_op->on_complete) { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + absl::OkStatus()); + } + } + oas->state.state_op_done[OP_ON_COMPLETE] = true; + oas->done = true; + // reset any send message state, only if this ON_COMPLETE is about a send. + // + if (stream_op->send_message) { + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + stream_state->state_op_done[OP_SEND_MESSAGE] = false; + } + result = ACTION_TAKEN_NO_CALLBACK; + // If this is the on_complete callback being called for a received message - + // make a note + if (stream_op->recv_message) { + stream_state->state_op_done[OP_RECV_MESSAGE_AND_ON_COMPLETE] = true; + } + + return result; +} + +static enum e_op_result execute_stream_op(struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + enum e_op_result result = NO_ACTION_POSSIBLE; + if (stream_op->send_initial_metadata && + op_can_be_run(stream_op, s, &oas->state, OP_SEND_INITIAL_METADATA)) { + result = execute_stream_op_send_initial_metadata(oas); + } else if (stream_op->send_message && + op_can_be_run(stream_op, s, &oas->state, OP_SEND_MESSAGE)) { + result = execute_stream_op_send_message(oas); + } else if (stream_op->send_trailing_metadata && + op_can_be_run(stream_op, s, &oas->state, + OP_SEND_TRAILING_METADATA)) { + result = execute_stream_op_send_trailing_metadata(oas); + } else if (stream_op->recv_initial_metadata && + op_can_be_run(stream_op, s, &oas->state, + OP_RECV_INITIAL_METADATA)) { + result = execute_stream_op_recv_initial_metadata(oas); + } else if (stream_op->recv_message && + op_can_be_run(stream_op, s, &oas->state, OP_RECV_MESSAGE)) { + result = execute_stream_op_recv_message(oas); } else if (stream_op->recv_trailing_metadata && op_can_be_run(stream_op, s, &oas->state, OP_RECV_TRAILING_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_TRAILING_METADATA", oas); - grpc_error_handle error; - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - error = stream_state->cancel_error; - } else if (stream_state->state_callback_received[OP_FAILED]) { - grpc_status_code grpc_error_code = - cronet_net_error_to_grpc_error(stream_state->net_error); - const char* desc = cronet_net_error_as_string(stream_state->net_error); - error = - make_error_with_desc(grpc_error_code, stream_state->net_error, desc); - } else if (oas->s->state.rs.trailing_metadata_valid) { - *stream_op->payload->recv_trailing_metadata.recv_trailing_metadata = - std::move(oas->s->state.rs.trailing_metadata); - stream_state->rs.trailing_metadata_valid = false; - } - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, - error); - stream_state->state_op_done[OP_RECV_TRAILING_METADATA] = true; - result = ACTION_TAKEN_NO_CALLBACK; + result = execute_stream_op_recv_trailing_metadata(oas); } else if (stream_op->cancel_stream && op_can_be_run(stream_op, s, &oas->state, OP_CANCEL_ERROR)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_CANCEL_ERROR", oas); - if (s->cbs) { - CRONET_LOG(GPR_DEBUG, "W: bidirectional_stream_cancel(%p)", s->cbs); - bidirectional_stream_cancel(s->cbs); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - result = ACTION_TAKEN_NO_CALLBACK; - } - stream_state->state_op_done[OP_CANCEL_ERROR] = true; - if (stream_state->cancel_error.ok()) { - stream_state->cancel_error = - stream_op->payload->cancel_stream.cancel_error; - } + result = execute_stream_op_cancel_stream(oas); } else if (op_can_be_run(stream_op, s, &oas->state, OP_ON_COMPLETE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - if (stream_op->on_complete) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, - stream_state->cancel_error); - } - } else if (stream_state->state_callback_received[OP_FAILED]) { - if (stream_op->on_complete) { - const char* error_message = - cronet_net_error_as_string(stream_state->net_error); - grpc_status_code grpc_error_code = - cronet_net_error_to_grpc_error(stream_state->net_error); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->on_complete, - make_error_with_desc(grpc_error_code, stream_state->net_error, - error_message)); - } - } else { - // All actions in this stream_op are complete. Call the on_complete - // callback - // - if (stream_op->on_complete) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, - absl::OkStatus()); - } - } - oas->state.state_op_done[OP_ON_COMPLETE] = true; - oas->done = true; - // reset any send message state, only if this ON_COMPLETE is about a send. - // - if (stream_op->send_message) { - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - stream_state->state_op_done[OP_SEND_MESSAGE] = false; - } - result = ACTION_TAKEN_NO_CALLBACK; - // If this is the on_complete callback being called for a received message - - // make a note - if (stream_op->recv_message) { - stream_state->state_op_done[OP_RECV_MESSAGE_AND_ON_COMPLETE] = true; - } + result = execute_stream_op_on_complete(oas); } else { result = NO_ACTION_POSSIBLE; } @@ -1420,7 +1510,7 @@ void grpc_cronet_transport::InitStream(grpc_stream* gs, void grpc_cronet_transport::PerformStreamOp( grpc_stream* gs, grpc_transport_stream_op_batch* op) { - CRONET_LOG(GPR_DEBUG, "perform_stream_op"); + GRPC_TRACE_VLOG(cronet, 2) << "perform_stream_op"; if (op->send_initial_metadata && header_has_authority( op->payload->send_initial_metadata.send_initial_metadata)) { @@ -1486,8 +1576,8 @@ grpc_core::Transport* grpc_create_cronet_transport( if (0 == strcmp(args->args[i].key, GRPC_ARG_USE_CRONET_PACKET_COALESCING)) { if (GPR_UNLIKELY(args->args[i].type != GRPC_ARG_INTEGER)) { - gpr_log(GPR_ERROR, "%s ignored: it must be an integer", - GRPC_ARG_USE_CRONET_PACKET_COALESCING); + LOG(ERROR) << GRPC_ARG_USE_CRONET_PACKET_COALESCING + << " ignored: it must be an integer"; } else { ct->use_packet_coalescing = (args->args[i].value.integer != 0); } diff --git a/deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc b/deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc index 2f884fd71e..a967b4c0d9 100644 --- a/deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc +++ b/deps/grpc/src/core/ext/transport/inproc/inproc_transport.cc @@ -15,21 +15,26 @@ #include "src/core/ext/transport/inproc/inproc_transport.h" #include +#include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" #include -#include #include #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/surface/channel_create.h" +#include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" @@ -56,12 +61,14 @@ class InprocServerTransport final : public ServerTransport { state_.compare_exchange_strong(expect, ConnectionState::kReady, std::memory_order_acq_rel, std::memory_order_acquire); - MutexLock lock(&state_tracker_mu_); - state_tracker_.SetState(GRPC_CHANNEL_READY, absl::OkStatus(), - "accept function set"); + connected_state()->SetReady(); } - void Orphan() override { Unref(); } + void Orphan() override { + GRPC_TRACE_LOG(inproc, INFO) << "InprocServerTransport::Orphan(): " << this; + Disconnect(absl::UnavailableError("Server transport closed")); + Unref(); + } FilterStackTransport* filter_stack_transport() override { return nullptr; } ClientTransport* client_transport() override { return nullptr; } @@ -73,26 +80,27 @@ class InprocServerTransport final : public ServerTransport { GRPC_TRACE_LOG(inproc, INFO) << "inproc server op: " << grpc_transport_op_string(op); if (op->start_connectivity_watch != nullptr) { - MutexLock lock(&state_tracker_mu_); - state_tracker_.AddWatcher(op->start_connectivity_watch_state, - std::move(op->start_connectivity_watch)); + connected_state()->AddWatcher(op->start_connectivity_watch_state, + std::move(op->start_connectivity_watch)); } if (op->stop_connectivity_watch != nullptr) { - MutexLock lock(&state_tracker_mu_); - state_tracker_.RemoveWatcher(op->stop_connectivity_watch); + connected_state()->RemoveWatcher(op->stop_connectivity_watch); } if (op->set_accept_stream) { Crash("set_accept_stream not supported on inproc transport"); } + ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, absl::OkStatus()); } void Disconnect(absl::Status error) { - if (disconnecting_.exchange(true, std::memory_order_relaxed)) return; - disconnect_error_ = std::move(error); + RefCountedPtr connected_state; + { + MutexLock lock(&connected_state_mu_); + connected_state = std::move(connected_state_); + } + if (connected_state == nullptr) return; + connected_state->Disconnect(std::move(error)); state_.store(ConnectionState::kDisconnected, std::memory_order_relaxed); - MutexLock lock(&state_tracker_mu_); - state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN, disconnect_error_, - "inproc transport disconnected"); } absl::StatusOr AcceptCall(ClientMetadataHandle md) { @@ -105,24 +113,64 @@ class InprocServerTransport final : public ServerTransport { case ConnectionState::kReady: break; } - auto server_call = MakeCallPair(std::move(md), event_engine_.get(), - call_arena_allocator_->MakeArena()); + auto arena = call_arena_allocator_->MakeArena(); + arena->SetContext( + event_engine_.get()); + auto server_call = MakeCallPair(std::move(md), std::move(arena)); unstarted_call_handler_->StartCall(std::move(server_call.handler)); return std::move(server_call.initiator); } OrphanablePtr MakeClientTransport(); + class ConnectedState : public RefCounted { + public: + ~ConnectedState() override { + state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN, disconnect_error_, + "inproc transport disconnected"); + } + + void SetReady() { + MutexLock lock(&state_tracker_mu_); + state_tracker_.SetState(GRPC_CHANNEL_READY, absl::OkStatus(), + "accept function set"); + } + + void Disconnect(absl::Status error) { + disconnect_error_ = std::move(error); + } + + void AddWatcher(grpc_connectivity_state initial_state, + OrphanablePtr watcher) { + MutexLock lock(&state_tracker_mu_); + state_tracker_.AddWatcher(initial_state, std::move(watcher)); + } + + void RemoveWatcher(ConnectivityStateWatcherInterface* watcher) { + MutexLock lock(&state_tracker_mu_); + state_tracker_.RemoveWatcher(watcher); + } + + private: + absl::Status disconnect_error_; + Mutex state_tracker_mu_; + ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(state_tracker_mu_){ + "inproc_server_transport", GRPC_CHANNEL_CONNECTING}; + }; + + RefCountedPtr connected_state() { + MutexLock lock(&connected_state_mu_); + return connected_state_; + } + private: enum class ConnectionState : uint8_t { kInitial, kReady, kDisconnected }; std::atomic state_{ConnectionState::kInitial}; - std::atomic disconnecting_{false}; RefCountedPtr unstarted_call_handler_; - absl::Status disconnect_error_; - Mutex state_tracker_mu_; - ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(state_tracker_mu_){ - "inproc_server_transport", GRPC_CHANNEL_CONNECTING}; + Mutex connected_state_mu_; + RefCountedPtr connected_state_ + ABSL_GUARDED_BY(connected_state_mu_) = MakeRefCounted(); const std::shared_ptr event_engine_; const RefCountedPtr call_arena_allocator_; @@ -139,19 +187,27 @@ class InprocClientTransport final : public ClientTransport { "pull_initial_metadata", TrySeq(child_call_handler.PullClientInitialMetadata(), [server_transport = server_transport_, - child_call_handler](ClientMetadataHandle md) { + connected_state = server_transport_->connected_state(), + child_call_handler](ClientMetadataHandle md) mutable { auto server_call_initiator = server_transport->AcceptCall(std::move(md)); if (!server_call_initiator.ok()) { return server_call_initiator.status(); } - ForwardCall(child_call_handler, - std::move(*server_call_initiator)); + ForwardCall( + child_call_handler, std::move(*server_call_initiator), + [connected_state = + std::move(connected_state)](ServerMetadata& md) { + md.Set(GrpcStatusFromWire(), true); + }); return absl::OkStatus(); })); } - void Orphan() override { delete this; } + void Orphan() override { + GRPC_TRACE_LOG(inproc, INFO) << "InprocClientTransport::Orphan(): " << this; + Unref(); + } FilterStackTransport* filter_stack_transport() override { return nullptr; } ClientTransport* client_transport() override { return this; } @@ -170,8 +226,10 @@ class InprocClientTransport final : public ClientTransport { const RefCountedPtr server_transport_; }; -bool UsePromiseBasedTransport() { - return IsPromiseBasedInprocTransportEnabled(); +bool UsePromiseBasedTransport(const ChannelArgs& channel_args) { + return channel_args + .GetBool("grpc.experimental.promise_based_inproc_transport") + .value_or(IsPromiseBasedInprocTransportEnabled()); } OrphanablePtr @@ -182,8 +240,7 @@ InprocServerTransport::MakeClientTransport() { RefCountedPtr MakeLameChannel(absl::string_view why, absl::Status error) { - gpr_log(GPR_ERROR, "%s: %s", std::string(why).c_str(), - std::string(error.message()).c_str()); + LOG(ERROR) << why << ": " << error.message(); intptr_t integer; grpc_status_code status = GRPC_STATUS_INTERNAL; if (grpc_error_get_int(error, StatusIntProperty::kRpcStatus, &integer)) { @@ -210,7 +267,8 @@ RefCountedPtr MakeInprocChannel(Server* server, std::ignore = server_transport.release(); // consumed by SetupTransport auto channel = ChannelCreate( "inproc", - client_channel_args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "inproc.authority"), + client_channel_args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "inproc.authority") + .Set(GRPC_ARG_USE_V3_STACK, true), GRPC_CLIENT_DIRECT_CHANNEL, client_transport.release()); if (!channel.ok()) { return MakeLameChannel("Failed to create client channel", channel.status()); @@ -235,13 +293,14 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, void* reserved) { grpc_core::ApplicationCallbackExecCtx app_exec_ctx; grpc_core::ExecCtx exec_ctx; - if (!grpc_core::UsePromiseBasedTransport()) { + const auto channel_args = grpc_core::CoreConfiguration::Get() + .channel_args_preconditioning() + .PreconditionChannelArgs(args); + if (!grpc_core::UsePromiseBasedTransport(channel_args)) { return grpc_legacy_inproc_channel_create(server, args, reserved); } return grpc_core::MakeInprocChannel(grpc_core::Server::FromC(server), - grpc_core::CoreConfiguration::Get() - .channel_args_preconditioning() - .PreconditionChannelArgs(args)) + channel_args) .release() ->c_ptr(); } diff --git a/deps/grpc/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/deps/grpc/src/core/ext/transport/inproc/legacy_inproc_transport.cc index fd8699f9b9..ae2441db5d 100644 --- a/deps/grpc/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/deps/grpc/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -60,7 +59,6 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" @@ -69,13 +67,6 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" -#define INPROC_LOG(...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(inproc)) { \ - gpr_log(__VA_ARGS__); \ - } \ - } while (0) - namespace { struct inproc_stream; bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error); @@ -149,16 +140,16 @@ struct inproc_transport final : public grpc_core::FilterStackTransport { void Orphan() override; void ref() { - INPROC_LOG(GPR_INFO, "ref_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "ref_transport " << this; gpr_ref(&refs); } void unref() { - INPROC_LOG(GPR_INFO, "unref_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "unref_transport " << this; if (!gpr_unref(&refs)) { return; } - INPROC_LOG(GPR_INFO, "really_destroy_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "really_destroy_transport " << this; this->~inproc_transport(); gpr_free(this); } @@ -202,8 +193,9 @@ struct inproc_stream { // Pass the client-side stream address to the server-side for a ref ref("inproc_init_stream:clt"); // ref it now on behalf of server // side to avoid destruction - INPROC_LOG(GPR_INFO, "calling accept stream cb %p %p", - st->accept_stream_cb, st->accept_stream_data); + GRPC_TRACE_LOG(inproc, INFO) + << "calling accept stream cb " << st->accept_stream_cb << " " + << st->accept_stream_data; (*st->accept_stream_cb)(st->accept_stream_data, t, this); } else { // This is the server-side and is being called through accept_stream_cb @@ -252,12 +244,12 @@ struct inproc_stream { #define STREAM_UNREF(refs, reason) grpc_stream_unref(refs) #endif void ref(const char* reason) { - INPROC_LOG(GPR_INFO, "ref_stream %p %s", this, reason); + GRPC_TRACE_LOG(inproc, INFO) << "ref_stream " << this << " " << reason; STREAM_REF(refs, reason); } void unref(const char* reason) { - INPROC_LOG(GPR_INFO, "unref_stream %p %s", this, reason); + GRPC_TRACE_LOG(inproc, INFO) << "unref_stream " << this << " " << reason; STREAM_UNREF(refs, reason); } #undef STREAM_REF @@ -373,7 +365,8 @@ void inproc_transport::InitStream(grpc_stream* gs, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena) { - INPROC_LOG(GPR_INFO, "init_stream %p %p %p", this, gs, server_data); + GRPC_TRACE_LOG(inproc, INFO) + << "init_stream " << this << " " << gs << " " << server_data; new (gs) inproc_stream(this, refcount, server_data, arena); } @@ -435,8 +428,9 @@ void complete_if_batch_end_locked(inproc_stream* s, grpc_error_handle error, int is_rtm = static_cast(op == s->recv_trailing_md_op); if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { - INPROC_LOG(GPR_INFO, "%s %p %p %p %s", msg, s, op, op->on_complete, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << msg << " " << s << " " << op << " " << op->on_complete << " " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete, error); } } @@ -449,7 +443,7 @@ void maybe_process_ops_locked(inproc_stream* s, grpc_error_handle error) { } void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { - INPROC_LOG(GPR_INFO, "op_state_machine %p fail_helper", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s << " fail_helper"; // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata if (!s->trailing_md_sent) { @@ -501,10 +495,10 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { *s->recv_initial_md_op->payload->recv_initial_metadata .trailing_metadata_available = true; } - INPROC_LOG(GPR_INFO, - "fail_helper %p scheduling initial-metadata-ready %s %s", s, - grpc_core::StatusToString(error).c_str(), - grpc_core::StatusToString(err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling initial-metadata-ready " + << grpc_core::StatusToString(error) << " " + << grpc_core::StatusToString(err); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_initial_md_op->payload->recv_initial_metadata @@ -518,8 +512,9 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { s->recv_initial_md_op = nullptr; } if (s->recv_message_op) { - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling message-ready %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling message-ready " + << grpc_core::StatusToString(error); if (s->recv_message_op->payload->recv_message .call_failed_before_recv_message != nullptr) { *s->recv_message_op->payload->recv_message @@ -547,15 +542,17 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { s->send_trailing_md_op = nullptr; } if (s->recv_trailing_md_op) { - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling trailing-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, error); - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-md-on-complete %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling trailing-md-on-complete " + << grpc_core::StatusToString(error); complete_if_batch_end_locked( s, error, s->recv_trailing_md_op, "fail_helper scheduling recv-trailing-metadata-on-complete"); @@ -579,8 +576,8 @@ void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { *receiver->recv_message_op->payload->recv_message.flags = sender->send_message_op->payload->send_message.flags; - INPROC_LOG(GPR_INFO, "message_transfer_locked %p scheduling message-ready", - receiver); + GRPC_TRACE_LOG(inproc, INFO) + << "message_transfer_locked " << receiver << " scheduling message-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, receiver->recv_message_op->payload->recv_message.recv_message_ready, @@ -606,7 +603,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { bool needs_close = false; - INPROC_LOG(GPR_INFO, "op_state_machine %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s; // cancellation takes precedence inproc_stream* other = s->other_side; @@ -653,7 +650,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { : &other->to_read_trailing_md_filled; if (*destfilled || s->trailing_md_sent) { // The buffer is already in use; that's an error! - INPROC_LOG(GPR_INFO, "Extra trailing metadata %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "Extra trailing metadata " << s; new_err = GRPC_ERROR_CREATE("Extra trailing metadata"); fail_helper_locked(s, new_err); goto done; @@ -669,15 +666,15 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { *s->send_trailing_md_op->payload->send_trailing_metadata.sent = true; } if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { - INPROC_LOG(GPR_INFO, - "op_state_machine %p scheduling trailing-metadata-ready", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s + << " scheduling trailing-metadata-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, absl::OkStatus()); - INPROC_LOG(GPR_INFO, - "op_state_machine %p scheduling trailing-md-on-complete", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s + << " scheduling trailing-md-on-complete"; grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->recv_trailing_md_op->on_complete, absl::OkStatus()); @@ -694,11 +691,11 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->recv_initial_md_op) { if (s->initial_md_recvd) { new_err = GRPC_ERROR_CREATE("Already recvd initial md"); - INPROC_LOG( - GPR_INFO, - "op_state_machine %p scheduling on_complete errors for already " - "recvd initial md %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " scheduling on_complete errors for already " + "recvd initial md " + << grpc_core::StatusToString(new_err); fail_helper_locked(s, new_err); goto done; } @@ -749,20 +746,20 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->to_read_trailing_md_filled) { if (s->trailing_md_recvd) { if (s->trailing_md_recvd_implicit_only) { - INPROC_LOG(GPR_INFO, - "op_state_machine %p already implicitly received trailing " - "metadata, so ignoring new trailing metadata from client", - s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " already implicitly received trailing metadata, so " + "ignoring new trailing metadata from client"; s->to_read_trailing_md.Clear(); s->to_read_trailing_md_filled = false; s->trailing_md_recvd_implicit_only = false; } else { new_err = GRPC_ERROR_CREATE("Already recvd trailing md"); - INPROC_LOG( - GPR_INFO, - "op_state_machine %p scheduling on_complete errors for already " - "recvd trailing md %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " scheduling on_complete errors for already recvd trailing " + "md " + << grpc_core::StatusToString(new_err); fail_helper_locked(s, new_err); goto done; } @@ -771,7 +768,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { // This message needs to be wrapped up because it will never be // satisfied s->recv_message_op->payload->recv_message.recv_message->reset(); - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling message-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_message_op->payload->recv_message.recv_message_ready, @@ -822,9 +820,9 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { needs_close = s->trailing_md_sent; } } else if (!s->trailing_md_recvd) { - INPROC_LOG( - GPR_INFO, - "op_state_machine %p has trailing md but not yet waiting for it", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " has trailing md but not yet waiting for it"; } } if (!s->t->is_client && s->trailing_md_sent && @@ -832,8 +830,9 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { // In this case, we don't care to receive the write-close from the client // because we have already sent status and the RPC is over as far as we // are concerned. - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling trailing-md-ready %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling trailing-md-ready " + << grpc_core::StatusToString(new_err); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata @@ -851,7 +850,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->trailing_md_recvd && s->recv_message_op) { // No further message will come on this stream, so finish off the // recv_message_op - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling message-ready"; s->recv_message_op->payload->recv_message.recv_message->reset(); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -873,12 +873,12 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { } if (s->send_message_op || s->send_trailing_md_op || s->recv_initial_md_op || s->recv_message_op || s->recv_trailing_md_op) { - // Didn't get the item we wanted so we still need to get - // rescheduled - INPROC_LOG( - GPR_INFO, "op_state_machine %p still needs closure %p %p %p %p %p", s, - s->send_message_op, s->send_trailing_md_op, s->recv_initial_md_op, - s->recv_message_op, s->recv_trailing_md_op); + // Didn't get the item we wanted so we still need to get rescheduled + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " still needs closure " + << s->send_message_op << " " << s->send_trailing_md_op << " " + << s->recv_initial_md_op << " " << s->recv_message_op << " " + << s->recv_trailing_md_op; s->ops_needed = true; } done: @@ -890,8 +890,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error) { bool ret = false; // was the cancel accepted - INPROC_LOG(GPR_INFO, "cancel_stream %p with %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "cancel_stream " << s << " with " << grpc_core::StatusToString(error); if (s->cancel_self_error.ok()) { ret = true; s->cancel_self_error = error; @@ -944,7 +944,8 @@ bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error) { void inproc_transport::PerformStreamOp(grpc_stream* gs, grpc_transport_stream_op_batch* op) { - INPROC_LOG(GPR_INFO, "perform_stream_op %p %p %p", this, gs, op); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << this << " " << gs << " " << op; inproc_stream* s = reinterpret_cast(gs); gpr_mu* mu = &s->t->mu->mu; // save aside in case s gets closed gpr_mu_lock(mu); @@ -980,14 +981,15 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, // already self-canceled so still give it an error error = s->cancel_self_error; } else { - INPROC_LOG(GPR_INFO, "perform_stream_op %p %s%s%s%s%s%s%s", s, - s->t->is_client ? "client" : "server", - op->send_initial_metadata ? " send_initial_metadata" : "", - op->send_message ? " send_message" : "", - op->send_trailing_metadata ? " send_trailing_metadata" : "", - op->recv_initial_metadata ? " recv_initial_metadata" : "", - op->recv_message ? " recv_message" : "", - op->recv_trailing_metadata ? " recv_trailing_metadata" : ""); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << s + << (s->t->is_client ? " client" : " server") + << (op->send_initial_metadata ? " send_initial_metadata" : "") + << (op->send_message ? " send_message" : "") + << (op->send_trailing_metadata ? " send_trailing_metadata" : "") + << (op->recv_initial_metadata ? " recv_initial_metadata" : "") + << (op->recv_message ? " recv_message" : "") + << (op->recv_trailing_metadata ? " recv_trailing_metadata" : ""); } inproc_stream* other = s->other_side; @@ -1003,7 +1005,7 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, : &other->to_read_initial_md_filled; if (*destfilled || s->initial_md_sent) { // The buffer is already in use; that's an error! - INPROC_LOG(GPR_INFO, "Extra initial metadata %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "Extra initial metadata " << s; error = GRPC_ERROR_CREATE("Extra initial metadata"); } else { if (!s->other_side_closed) { @@ -1081,20 +1083,18 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, *op->payload->recv_initial_metadata.trailing_metadata_available = true; } - INPROC_LOG( - GPR_INFO, - "perform_stream_op error %p scheduling initial-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling initial-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, op->payload->recv_initial_metadata.recv_initial_metadata_ready, error); } if (op->recv_message) { - INPROC_LOG( - GPR_INFO, - "perform_stream_op error %p scheduling recv message-ready %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling recv message-ready " + << grpc_core::StatusToString(error); if (op->payload->recv_message.call_failed_before_recv_message != nullptr) { *op->payload->recv_message.call_failed_before_recv_message = true; @@ -1104,25 +1104,27 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, error); } if (op->recv_trailing_metadata) { - INPROC_LOG(GPR_INFO, - "perform_stream_op error %p scheduling " - "trailing-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling trailing-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, error); } } - INPROC_LOG(GPR_INFO, "perform_stream_op %p scheduling on_complete %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << s << " scheduling on_complete " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_complete, error); } gpr_mu_unlock(mu); } void close_transport_locked(inproc_transport* t) { - INPROC_LOG(GPR_INFO, "close_transport %p %d", t, t->is_closed); + GRPC_TRACE_LOG(inproc, INFO) + << "close_transport " << t << " " << t->is_closed; + t->state_tracker.SetState(GRPC_CHANNEL_SHUTDOWN, absl::Status(), "close transport"); if (!t->is_closed) { @@ -1140,7 +1142,7 @@ void close_transport_locked(inproc_transport* t) { } void inproc_transport::PerformOp(grpc_transport_op* op) { - INPROC_LOG(GPR_INFO, "perform_transport_op %p %p", this, op); + GRPC_TRACE_LOG(inproc, INFO) << "perform_transport_op " << this << " " << op; gpr_mu_lock(&mu->mu); if (op->start_connectivity_watch != nullptr) { state_tracker.AddWatcher(op->start_connectivity_watch_state, @@ -1174,7 +1176,8 @@ void inproc_transport::PerformOp(grpc_transport_op* op) { void inproc_transport::DestroyStream(grpc_stream* gs, grpc_closure* then_schedule_closure) { - INPROC_LOG(GPR_INFO, "destroy_stream %p %p", gs, then_schedule_closure); + GRPC_TRACE_LOG(inproc, INFO) + << "destroy_stream " << gs << " " << then_schedule_closure; inproc_stream* s = reinterpret_cast(gs); gpr_mu_lock(&mu->mu); close_stream_locked(s); @@ -1185,7 +1188,7 @@ void inproc_transport::DestroyStream(grpc_stream* gs, } void inproc_transport::Orphan() { - INPROC_LOG(GPR_INFO, "destroy_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "destroy_transport " << this; gpr_mu_lock(&mu->mu); close_transport_locked(this); gpr_mu_unlock(&mu->mu); @@ -1218,7 +1221,7 @@ void inproc_transport::SetPollsetSet(grpc_stream* /*gs*/, // void inproc_transports_create(grpc_core::Transport** server_transport, grpc_core::Transport** client_transport) { - INPROC_LOG(GPR_INFO, "inproc_transports_create"); + GRPC_TRACE_LOG(inproc, INFO) << "inproc_transports_create"; shared_mu* mu = new (gpr_malloc(sizeof(*mu))) shared_mu(); inproc_transport* st = new (gpr_malloc(sizeof(*st))) inproc_transport(mu, /*is_client=*/false); @@ -1234,8 +1237,8 @@ void inproc_transports_create(grpc_core::Transport** server_transport, grpc_channel* grpc_legacy_inproc_channel_create(grpc_server* server, const grpc_channel_args* args, void* /*reserved*/) { - GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, - (server, args)); + GRPC_TRACE_LOG(api, INFO) << "grpc_inproc_channel_create(server=" << server + << ", args=" << args << ")"; grpc_core::ExecCtx exec_ctx; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h index 891fb3aab6..24c9c36d8d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h @@ -449,11 +449,11 @@ UPB_INLINE bool envoy_admin_v3_CertificateDetails_has_ocsp_details(const envoy_a UPB_INLINE void envoy_admin_v3_CertificateDetails_set_path(envoy_admin_v3_CertificateDetails *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_serial_number(envoy_admin_v3_CertificateDetails *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_SubjectAlternateName** envoy_admin_v3_CertificateDetails_mutable_subject_alt_names(envoy_admin_v3_CertificateDetails* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -487,11 +487,11 @@ UPB_INLINE struct envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_Certificat } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_days_until_expiration(envoy_admin_v3_CertificateDetails *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_valid_from(envoy_admin_v3_CertificateDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 64), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_valid_from(msg); @@ -503,7 +503,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_m } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_expiration_time(envoy_admin_v3_CertificateDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_expiration_time(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_expiration_time(msg); @@ -515,7 +515,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_m } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_ocsp_details(envoy_admin_v3_CertificateDetails *msg, envoy_admin_v3_CertificateDetails_OcspDetails* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 80), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_mutable_ocsp_details(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct envoy_admin_v3_CertificateDetails_OcspDetails* sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)envoy_admin_v3_CertificateDetails_ocsp_details(msg); @@ -597,7 +597,7 @@ UPB_INLINE bool envoy_admin_v3_CertificateDetails_OcspDetails_has_expiration(con UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_valid_from(msg); @@ -609,7 +609,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_O } UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(envoy_admin_v3_CertificateDetails_OcspDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_expiration(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_expiration(msg); @@ -718,15 +718,15 @@ UPB_INLINE bool envoy_admin_v3_SubjectAlternateName_has_ip_address(const envoy_a UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_dns(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_uri(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c index acf64ab512..f5ba742e8b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = { &envoy_admin_v3_Certificates_submsgs[0], &envoy_admin_v3_Certificates__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Certificates", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = { &envoy_admin_v3_Certificate_submsgs[0], &envoy_admin_v3_Certificate__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Certificate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -76,6 +82,9 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = { &envoy_admin_v3_CertificateDetails_submsgs[0], &envoy_admin_v3_CertificateDetails__fields[0], UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CertificateDetails", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -102,6 +111,9 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0], &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CertificateDetails.OcspDetails", +#endif }; static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] = { @@ -114,6 +126,9 @@ const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init = { NULL, &envoy_admin_v3_SubjectAlternateName__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SubjectAlternateName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h index 868df0fd69..1978b8504d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h @@ -307,15 +307,15 @@ UPB_INLINE upb_StringView envoy_admin_v3_ClusterStatus_eds_service_name(const en UPB_INLINE void envoy_admin_v3_ClusterStatus_set_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_added_via_api(envoy_admin_v3_ClusterStatus *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_success_rate_ejection_threshold(msg); @@ -357,7 +357,7 @@ UPB_INLINE struct envoy_admin_v3_HostStatus* envoy_admin_v3_ClusterStatus_add_ho } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_local_origin_success_rate_ejection_threshold(msg); @@ -369,7 +369,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_lo } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_circuit_breakers(envoy_admin_v3_ClusterStatus *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_ClusterStatus_mutable_circuit_breakers(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_admin_v3_ClusterStatus_circuit_breakers(msg); @@ -381,11 +381,11 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_Cluste } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_observability_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_eds_service_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(44, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.HostStatus */ @@ -575,7 +575,7 @@ UPB_INLINE bool envoy_admin_v3_HostStatus_has_locality(const envoy_admin_v3_Host UPB_INLINE void envoy_admin_v3_HostStatus_set_address(envoy_admin_v3_HostStatus *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_mutable_address(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_HostStatus_address(msg); @@ -617,7 +617,7 @@ UPB_INLINE struct envoy_admin_v3_SimpleMetric* envoy_admin_v3_HostStatus_add_sta } UPB_INLINE void envoy_admin_v3_HostStatus_set_health_status(envoy_admin_v3_HostStatus *msg, envoy_admin_v3_HostHealthStatus* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mutable_health_status(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_admin_v3_HostHealthStatus* sub = (struct envoy_admin_v3_HostHealthStatus*)envoy_admin_v3_HostStatus_health_status(msg); @@ -629,7 +629,7 @@ UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mut } UPB_INLINE void envoy_admin_v3_HostStatus_set_success_rate(envoy_admin_v3_HostStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_success_rate(msg); @@ -641,19 +641,19 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_succe } UPB_INLINE void envoy_admin_v3_HostStatus_set_weight(envoy_admin_v3_HostStatus *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_hostname(envoy_admin_v3_HostStatus *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_priority(envoy_admin_v3_HostStatus *msg, uint32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_local_origin_success_rate(envoy_admin_v3_HostStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local_origin_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_local_origin_success_rate(msg); @@ -665,7 +665,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local } UPB_INLINE void envoy_admin_v3_HostStatus_set_locality(envoy_admin_v3_HostStatus *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutable_locality(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_admin_v3_HostStatus_locality(msg); @@ -811,35 +811,35 @@ UPB_INLINE bool envoy_admin_v3_HostHealthStatus_active_hc_timeout(const envoy_ad UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_active_health_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_outlier_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_eds_health_status(envoy_admin_v3_HostHealthStatus *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_active_degraded_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_pending_dynamic_removal(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {5, 17, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_pending_active_hc(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {6, 18, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_excluded_via_immediate_hc_fail(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {7, 19, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {8, 20, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c index c613ef5287..57e730c678 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = { &envoy_admin_v3_Clusters_submsgs[0], &envoy_admin_v3_Clusters__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Clusters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -60,6 +63,9 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = { &envoy_admin_v3_ClusterStatus_submsgs[0], &envoy_admin_v3_ClusterStatus__fields[0], UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClusterStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +111,9 @@ const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = { &envoy_admin_v3_HostStatus_submsgs[0], &envoy_admin_v3_HostStatus__fields[0], UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.HostStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -132,6 +141,9 @@ const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init = { NULL, &envoy_admin_v3_HostHealthStatus__fields[0], 24, 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.HostHealthStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h index 96de3e74c1..3d6440983a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h @@ -209,7 +209,7 @@ UPB_INLINE bool envoy_admin_v3_BootstrapConfigDump_has_last_updated(const envoy_ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_bootstrap(envoy_admin_v3_BootstrapConfigDump *msg, struct envoy_config_bootstrap_v3_Bootstrap* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapConfigDump_mutable_bootstrap(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap* sub = (struct envoy_config_bootstrap_v3_Bootstrap*)envoy_admin_v3_BootstrapConfigDump_bootstrap(msg); @@ -221,7 +221,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapC } UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_last_updated(envoy_admin_v3_BootstrapConfigDump *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_mutable_last_updated(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_BootstrapConfigDump_last_updated(msg); @@ -579,15 +579,15 @@ UPB_INLINE int32_t envoy_admin_v3_SecretsConfigDump_DynamicSecret_client_status( UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_name(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_version_info(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_last_updated(msg); @@ -599,7 +599,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_Dy } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_secret(msg); @@ -611,7 +611,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicS } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_error_state(msg); @@ -623,7 +623,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfi } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_client_status(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.SecretsConfigDump.StaticSecret */ @@ -709,11 +709,11 @@ UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_StaticSecret_has_secret(const e UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_name(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_StaticSecret_last_updated(msg); @@ -725,7 +725,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_St } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_StaticSecret_secret(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c index 995cdedffb..10dc05057e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = { &envoy_admin_v3_ConfigDump_submsgs[0], &envoy_admin_v3_ConfigDump__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -50,6 +53,9 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = { &envoy_admin_v3_BootstrapConfigDump_submsgs[0], &envoy_admin_v3_BootstrapConfigDump__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.BootstrapConfigDump", +#endif }; static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = { @@ -68,6 +74,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = { &envoy_admin_v3_SecretsConfigDump_submsgs[0], &envoy_admin_v3_SecretsConfigDump__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -95,6 +104,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump.DynamicSecret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -122,6 +134,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump.StaticSecret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h index 5ffe9762a3..74114bc69b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h @@ -151,7 +151,7 @@ UPB_INLINE upb_StringView envoy_admin_v3_UpdateFailureState_version_info(const e UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_failed_configuration(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_mutable_failed_configuration(envoy_admin_v3_UpdateFailureState* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_UpdateFailureState_failed_configuration(msg); @@ -163,7 +163,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_mutable } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_last_update_attempt(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_mutable_last_update_attempt(envoy_admin_v3_UpdateFailureState* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_UpdateFailureState_last_update_attempt(msg); @@ -175,11 +175,11 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_m } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_details(envoy_admin_v3_UpdateFailureState *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_version_info(envoy_admin_v3_UpdateFailureState *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ListenersConfigDump */ @@ -297,7 +297,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ListenersConfigDump_dynamic_listeners_muta UPB_INLINE void envoy_admin_v3_ListenersConfigDump_set_version_info(envoy_admin_v3_ListenersConfigDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener** envoy_admin_v3_ListenersConfigDump_mutable_static_listeners(envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -431,7 +431,7 @@ UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_StaticListener_has_last_updat UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_listener(envoy_admin_v3_ListenersConfigDump_StaticListener* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_StaticListener_listener(msg); @@ -443,7 +443,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_Static } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_StaticListener_last_updated(msg); @@ -537,11 +537,11 @@ UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListenerState_has_last UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_version_info(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_listener(msg); @@ -553,7 +553,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_Dynami } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_last_updated(msg); @@ -691,11 +691,11 @@ UPB_INLINE int32_t envoy_admin_v3_ListenersConfigDump_DynamicListener_client_sta UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_name(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) { struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_active_state(msg); @@ -707,7 +707,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) { struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_warming_state(msg); @@ -719,7 +719,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) { struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_draining_state(msg); @@ -731,7 +731,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_error_state(msg); @@ -743,7 +743,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersCon } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_client_status(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ClustersConfigDump */ @@ -893,7 +893,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_warming_cluster UPB_INLINE void envoy_admin_v3_ClustersConfigDump_set_version_info(envoy_admin_v3_ClustersConfigDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster** envoy_admin_v3_ClustersConfigDump_mutable_static_clusters(envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1057,7 +1057,7 @@ UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_StaticCluster_has_last_updated UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_StaticCluster_cluster(msg); @@ -1069,7 +1069,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticC } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_StaticCluster_last_updated(msg); @@ -1191,11 +1191,11 @@ UPB_INLINE int32_t envoy_admin_v3_ClustersConfigDump_DynamicCluster_client_statu UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_version_info(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_cluster(msg); @@ -1207,7 +1207,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_Dynamic } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_last_updated(msg); @@ -1219,7 +1219,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_D } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_error_state(msg); @@ -1231,7 +1231,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConf } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_client_status(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.RoutesConfigDump */ @@ -1467,7 +1467,7 @@ UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_has_last_updat UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_route_config(msg); @@ -1479,7 +1479,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRou } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_last_updated(msg); @@ -1601,11 +1601,11 @@ UPB_INLINE int32_t envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_client_sta UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_version_info(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_route_config(msg); @@ -1617,7 +1617,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRo } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_last_updated(msg); @@ -1629,7 +1629,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_Dyn } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_error_state(msg); @@ -1641,7 +1641,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfig } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_client_status(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ScopedRoutesConfigDump */ @@ -1905,7 +1905,7 @@ UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_h UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1939,7 +1939,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Inl } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_last_updated(msg); @@ -2089,11 +2089,11 @@ UPB_INLINE int32_t envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfi UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_version_info(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2127,7 +2127,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Dyn } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_last_updated(msg); @@ -2139,7 +2139,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDu } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_error_state(msg); @@ -2151,7 +2151,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutes } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_client_status(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.EndpointsConfigDump */ @@ -2387,7 +2387,7 @@ UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_has_last UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_endpoint_config(msg); @@ -2399,7 +2399,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_Static } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_last_updated(msg); @@ -2521,11 +2521,11 @@ UPB_INLINE int32_t envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_clie UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_version_info(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_endpoint_config(msg); @@ -2537,7 +2537,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_Dynami } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_last_updated(msg); @@ -2549,7 +2549,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_ } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_error_state(msg); @@ -2561,7 +2561,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsCon } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_client_status(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.EcdsConfigDump */ @@ -2775,11 +2775,11 @@ UPB_INLINE int32_t envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_client_status( UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_version_info(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_ecds_filter(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_ecds_filter(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_ecds_filter(msg); @@ -2791,7 +2791,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsFilterC } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_last_updated(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_last_updated(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_last_updated(msg); @@ -2803,7 +2803,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump_EcdsF } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_error_state(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_error_state(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_error_state(msg); @@ -2815,7 +2815,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDu } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c index e020a75bd8..9b6d0f47f2 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = { &envoy_admin_v3_UpdateFailureState_submsgs[0], &envoy_admin_v3_UpdateFailureState__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UpdateFailureState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -59,6 +62,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = { &envoy_admin_v3_ListenersConfigDump_submsgs[0], &envoy_admin_v3_ListenersConfigDump__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -81,6 +87,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.StaticListener", +#endif }; static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { @@ -98,6 +107,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_ &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.DynamicListenerState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.DynamicListener", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -153,6 +168,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = { &envoy_admin_v3_ClustersConfigDump_submsgs[0], &envoy_admin_v3_ClustersConfigDump__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -179,6 +197,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump.StaticCluster", +#endif }; static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { @@ -199,6 +220,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump.DynamicCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -225,6 +249,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = { &envoy_admin_v3_RoutesConfigDump_submsgs[0], &envoy_admin_v3_RoutesConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -247,6 +274,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump.StaticRouteConfig", +#endif }; static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { @@ -267,6 +297,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump.DynamicRouteConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -293,6 +326,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = { &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -316,6 +352,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump.InlineScopedRouteConfigs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -343,6 +382,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -369,6 +411,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = { &envoy_admin_v3_EndpointsConfigDump_submsgs[0], &envoy_admin_v3_EndpointsConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -391,6 +436,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_ &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig", +#endif }; static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { @@ -411,6 +459,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -435,6 +486,9 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = { &envoy_admin_v3_EcdsConfigDump_submsgs[0], &envoy_admin_v3_EcdsConfigDump__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EcdsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -459,6 +513,9 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0], &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EcdsConfigDump.EcdsFilterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h index 9bafaab9bf..8cebc1fc44 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h @@ -209,7 +209,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_tar UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_set_name(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_mutable_target_names(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c index 31a0388de5..5eeb6def2e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = { &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0], &envoy_admin_v3_UnreadyTargetsDumps__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UnreadyTargetsDumps", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -40,6 +43,9 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_ms NULL, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UnreadyTargetsDumps.UnreadyTargetsDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h index ef5f0ec647..59f1c051f4 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h @@ -228,11 +228,11 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ListenerStatus_additional_local_addresses_ UPB_INLINE void envoy_admin_v3_ListenerStatus_set_name(envoy_admin_v3_ListenerStatus *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenerStatus_set_local_address(envoy_admin_v3_ListenerStatus *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_mutable_local_address(envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_ListenerStatus_local_address(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c index 407d8d76eb..f6eaa9d79e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Listeners_msg_init = { &envoy_admin_v3_Listeners_submsgs[0], &envoy_admin_v3_Listeners__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Listeners", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -48,6 +51,9 @@ const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = { &envoy_admin_v3_ListenerStatus_submsgs[0], &envoy_admin_v3_ListenerStatus__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenerStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h index a904ecd164..3cbf0f06a2 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h @@ -137,27 +137,27 @@ UPB_INLINE uint64_t envoy_admin_v3_Memory_total_physical_bytes(const envoy_admin UPB_INLINE void envoy_admin_v3_Memory_set_allocated(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_heap_size(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_pageheap_unmapped(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_pageheap_free(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {4, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_total_thread_cache(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {5, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {6, 48, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c index 303139c5b1..fd5e62e5ea 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Memory_msg_init = { NULL, &envoy_admin_v3_Memory__fields[0], 56, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Memory", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h index 2b7533da86..bd205011ce 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h @@ -106,15 +106,15 @@ UPB_INLINE upb_StringView envoy_admin_v3_SimpleMetric_name(const envoy_admin_v3_ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_type(envoy_admin_v3_SimpleMetric *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SimpleMetric_set_value(envoy_admin_v3_SimpleMetric *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric *msg, upb_StringView value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c index 8a6d818a9d..0afd854374 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init = { NULL, &envoy_admin_v3_SimpleMetric__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SimpleMetric", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h index 7942e73aef..1461a20247 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h @@ -101,15 +101,15 @@ UPB_INLINE uint64_t envoy_admin_v3_MutexStats_lifetime_wait_cycles(const envoy_a UPB_INLINE void envoy_admin_v3_MutexStats_set_num_contentions(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_MutexStats_set_current_wait_cycles(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c index a24ea9d3be..264eb93fba 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__admin__v3__MutexStats_msg_init = { NULL, &envoy_admin_v3_MutexStats__fields[0], 32, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.MutexStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h index 549214f5db..a7e7a7cad7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h @@ -193,15 +193,15 @@ UPB_INLINE bool envoy_admin_v3_ServerInfo_has_node(const envoy_admin_v3_ServerIn UPB_INLINE void envoy_admin_v3_ServerInfo_set_version(envoy_admin_v3_ServerInfo *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_state(envoy_admin_v3_ServerInfo *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_current_epoch(envoy_admin_v3_ServerInfo *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_current_epoch(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_current_epoch(msg); @@ -213,7 +213,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_up } UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_all_epochs(envoy_admin_v3_ServerInfo *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_all_epochs(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_all_epochs(msg); @@ -225,11 +225,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_up } UPB_INLINE void envoy_admin_v3_ServerInfo_set_hot_restart_version(envoy_admin_v3_ServerInfo *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_command_line_options(envoy_admin_v3_ServerInfo *msg, envoy_admin_v3_CommandLineOptions* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_mutable_command_line_options(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct envoy_admin_v3_CommandLineOptions* sub = (struct envoy_admin_v3_CommandLineOptions*)envoy_admin_v3_ServerInfo_command_line_options(msg); @@ -241,7 +241,7 @@ UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_m } UPB_INLINE void envoy_admin_v3_ServerInfo_set_node(envoy_admin_v3_ServerInfo *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 72), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_node(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_admin_v3_ServerInfo_node(msg); @@ -289,13 +289,13 @@ UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize_ex(const envoy_admi return ptr; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_admin_v3_CommandLineOptions_base_id(const envoy_admin_v3_CommandLineOptions* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -313,25 +313,25 @@ UPB_INLINE uint32_t envoy_admin_v3_CommandLineOptions_concurrency(const envoy_ad return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_config_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_config_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_config_yaml(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_config_yaml(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -349,13 +349,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_allow_unknown_static_fields(co return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_admin_address_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_admin_address_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -373,85 +373,85 @@ UPB_INLINE int32_t envoy_admin_v3_CommandLineOptions_local_address_ip_version(co return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_level(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_level(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_component_log_level(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_component_log_level(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_format(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_format(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_cluster(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_cluster(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_node(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_node(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_zone(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_zone(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -645,13 +645,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_use_dynamic_base_id(const envo return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_base_id_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -681,13 +681,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_enable_fine_grain_logging(cons return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_socket_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_socket_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -748,66 +748,90 @@ UPB_INLINE upb_Array* _envoy_admin_v3_CommandLineOptions_stats_tag_mutable_upb_a } return arr; } +UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_skip_hot_restart_on_no_parent(envoy_admin_v3_CommandLineOptions* msg) { + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_admin_v3_CommandLineOptions_skip_hot_restart_on_no_parent(const envoy_admin_v3_CommandLineOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_skip_hot_restart_parent_stats(envoy_admin_v3_CommandLineOptions* msg) { + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_admin_v3_CommandLineOptions_skip_hot_restart_parent_stats(const envoy_admin_v3_CommandLineOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_base_id(envoy_admin_v3_CommandLineOptions *msg, uint64_t value) { - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_concurrency(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_config_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_config_yaml(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_allow_unknown_static_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {5, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_admin_address_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_local_address_ip_version(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {7, 20, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_level(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_component_log_level(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_format(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_cluster(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_node(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_zone(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_file_flush_interval(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(24, 232), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_file_flush_interval(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_file_flush_interval(msg); @@ -819,7 +843,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_time(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {17, UPB_SIZE(28, 240), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_drain_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_drain_time(msg); @@ -831,7 +855,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {18, UPB_SIZE(32, 248), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_parent_shutdown_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_parent_shutdown_time(msg); @@ -843,31 +867,31 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_mode(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {19, UPB_SIZE(36, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_disable_hot_restart(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(40, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_mutex_tracing(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(41, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_restart_epoch(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(44, 32), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_cpuset_threads(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(48, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_reject_unknown_dynamic_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(49, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_format_escaped(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(50, 38), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_CommandLineOptions_mutable_disabled_extensions(envoy_admin_v3_CommandLineOptions* msg, size_t* size) { upb_MiniTableField field = {28, UPB_SIZE(52, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -899,35 +923,35 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_disabled_extensions(envoy_ } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_ignore_unknown_dynamic_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {30, UPB_SIZE(56, 39), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_use_dynamic_base_id(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(57, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_base_id_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_strategy(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {33, UPB_SIZE(60, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_fine_grain_logging(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {34, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_socket_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_socket_mode(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {36, UPB_SIZE(68, 52), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_core_dump(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {37, UPB_SIZE(72, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_CommandLineOptions_mutable_stats_tag(envoy_admin_v3_CommandLineOptions* msg, size_t* size) { upb_MiniTableField field = {38, UPB_SIZE(76, 296), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -957,6 +981,14 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_stats_tag(envoy_admin_v3_C (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); return true; } +UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_on_no_parent(envoy_admin_v3_CommandLineOptions *msg, bool value) { + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_parent_stats(envoy_admin_v3_CommandLineOptions *msg, bool value) { + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} #ifdef __cplusplus } /* extern "C" */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c index 269692be82..1bd4fa1ae7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = { &envoy_admin_v3_ServerInfo_submsgs[0], &envoy_admin_v3_ServerInfo__fields[0], UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ServerInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -55,21 +58,21 @@ static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, }; -static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = { - {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] = { + {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {5, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {7, 20, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(24, 232), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {17, UPB_SIZE(28, 240), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {18, UPB_SIZE(32, 248), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -83,19 +86,24 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = {28, UPB_SIZE(52, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(56, 39), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(57, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(60, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {36, UPB_SIZE(68, 52), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {37, UPB_SIZE(72, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {38, UPB_SIZE(76, 296), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = { &envoy_admin_v3_CommandLineOptions_submsgs[0], &envoy_admin_v3_CommandLineOptions__fields[0], - UPB_SIZE(184, 304), 34, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(192, 304), 36, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CommandLineOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x004000003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h index 81ab0879c0..d262247f6f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h @@ -96,11 +96,11 @@ UPB_INLINE bool envoy_admin_v3_TapRequest_has_tap_config(const envoy_admin_v3_Ta UPB_INLINE void envoy_admin_v3_TapRequest_set_config_id(envoy_admin_v3_TapRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_TapRequest_set_tap_config(envoy_admin_v3_TapRequest *msg, struct envoy_config_tap_v3_TapConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutable_tap_config(envoy_admin_v3_TapRequest* msg, upb_Arena* arena) { struct envoy_config_tap_v3_TapConfig* sub = (struct envoy_config_tap_v3_TapConfig*)envoy_admin_v3_TapRequest_tap_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c index 7c6da534cf..9f7117f066 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = { &envoy_admin_v3_TapRequest_submsgs[0], &envoy_admin_v3_TapRequest__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.TapRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h index 9b20f40606..afaadfcff9 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h @@ -46,7 +46,7 @@ UPB_INLINE void envoy_annotations_set_disallowed_by_default(struct google_protob UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_deprecated_at_minor_version(const struct google_protobuf_FieldOptions* msg) { @@ -70,7 +70,7 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version(struct google_ UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_StringView); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_disallowed_by_default_enum(const struct google_protobuf_EnumValueOptions* msg) { @@ -94,7 +94,7 @@ UPB_INLINE void envoy_annotations_set_disallowed_by_default_enum(struct google_p UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_deprecated_at_minor_version_enum(const struct google_protobuf_EnumValueOptions* msg) { @@ -118,7 +118,7 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_StringView); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb.h index a3a1ef78e1..fd843799ad 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView envoy_annotations_ResourceAnnotation_type(const envoy_ UPB_INLINE void envoy_annotations_ResourceAnnotation_set_type(envoy_annotations_ResourceAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool envoy_annotations_has_resource(const struct google_protobuf_ServiceOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct envoy_annotations_ResourceAnnotation* envoy_annotations_mutable_resource(struct google_protobuf_ServiceOptions* msg, + upb_Arena* arena) { + struct envoy_annotations_ResourceAnnotation* sub = (struct envoy_annotations_ResourceAnnotation*)envoy_annotations_resource(msg); + if (sub == NULL) { + sub = (struct envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy__annotations__ResourceAnnotation_msg_init, arena); + if (sub) envoy_annotations_set_resource(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c index acfea01ac8..eaf425bb7e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = { NULL, &envoy_annotations_ResourceAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.annotations.ResourceAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h index e47bdf344d..fbc51acdb7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h @@ -173,11 +173,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_typed_config(const envoy UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_name(envoy_config_accesslog_v3_AccessLog *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_filter(envoy_config_accesslog_v3_AccessLog *msg, envoy_config_accesslog_v3_AccessLogFilter* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_mutable_filter(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_config_accesslog_v3_AccessLog_filter(msg); @@ -189,7 +189,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_typed_config(envoy_config_accesslog_v3_AccessLog *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutable_typed_config(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_AccessLog_typed_config(msg); @@ -468,7 +468,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_log_type_filter(co UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_StatusCodeFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_StatusCodeFilter* sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(msg); @@ -480,7 +480,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_acces } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_DurationFilter* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_DurationFilter* sub = (struct envoy_config_accesslog_v3_DurationFilter*)envoy_config_accesslog_v3_AccessLogFilter_duration_filter(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accessl } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_NotHealthCheckFilter* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_NotHealthCheckFilter* sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_a } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_TraceableFilter* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_TraceableFilter* sub = (struct envoy_config_accesslog_v3_TraceableFilter*)envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_RuntimeFilter* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_RuntimeFilter* sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslo } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_AndFilter* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AndFilter* sub = (struct envoy_config_accesslog_v3_AndFilter*)envoy_config_accesslog_v3_AccessLogFilter_and_filter(msg); @@ -540,7 +540,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3 } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_OrFilter* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_OrFilter* sub = (struct envoy_config_accesslog_v3_OrFilter*)envoy_config_accesslog_v3_AccessLogFilter_or_filter(msg); @@ -552,7 +552,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_ } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_HeaderFilter* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_HeaderFilter* sub = (struct envoy_config_accesslog_v3_HeaderFilter*)envoy_config_accesslog_v3_AccessLogFilter_header_filter(msg); @@ -564,7 +564,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ResponseFlagFilter* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ResponseFlagFilter* sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(msg); @@ -576,7 +576,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_acc } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_GrpcStatusFilter* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_GrpcStatusFilter* sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(msg); @@ -588,7 +588,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_acces } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ExtensionFilter* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ExtensionFilter* sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)envoy_config_accesslog_v3_AccessLogFilter_extension_filter(msg); @@ -600,7 +600,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_MetadataFilter* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_MetadataFilter* sub = (struct envoy_config_accesslog_v3_MetadataFilter*)envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accessl } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_LogTypeFilter* value) { const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_LogTypeFilter* sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(msg); @@ -690,11 +690,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_ComparisonFilter_has_value(const envoy UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_op(envoy_config_accesslog_v3_ComparisonFilter *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_value(envoy_config_accesslog_v3_ComparisonFilter *msg, struct envoy_config_core_v3_RuntimeUInt32* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_mutable_value(envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeUInt32* sub = (struct envoy_config_core_v3_RuntimeUInt32*)envoy_config_accesslog_v3_ComparisonFilter_value(msg); @@ -760,7 +760,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_StatusCodeFilter_has_comparison(const UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(envoy_config_accesslog_v3_StatusCodeFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_mutable_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_StatusCodeFilter_comparison(msg); @@ -826,7 +826,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_DurationFilter_has_comparison(const en UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_set_comparison(envoy_config_accesslog_v3_DurationFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_mutable_comparison(envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_DurationFilter_comparison(msg); @@ -992,11 +992,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_use_independent_randomne UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_runtime_key(envoy_config_accesslog_v3_RuntimeFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_mutable_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_Run } UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.AndFilter */ @@ -1266,7 +1266,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_HeaderFilter_has_header(const envoy_co UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_set_header(envoy_config_accesslog_v3_HeaderFilter *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_mutable_header(envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_accesslog_v3_HeaderFilter_header(msg); @@ -1486,7 +1486,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_add_statuses(envoy_co } UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_set_exclude(envoy_config_accesslog_v3_GrpcStatusFilter *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.MetadataFilter */ @@ -1560,7 +1560,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_match_if_key_not_fo UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_matcher(envoy_config_accesslog_v3_MetadataFilter *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_mutable_matcher(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_accesslog_v3_MetadataFilter_matcher(msg); @@ -1572,7 +1572,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_ } UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_mutable_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(msg); @@ -1694,7 +1694,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_add_types(envoy_config_a } UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_set_exclude(envoy_config_accesslog_v3_LogTypeFilter *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.ExtensionFilter */ @@ -1773,11 +1773,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_ExtensionFilter_has_typed_config(const UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_name(envoy_config_accesslog_v3_ExtensionFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(envoy_config_accesslog_v3_ExtensionFilter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_mutable_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_ExtensionFilter_typed_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c index db6a668580..12abdcaae9 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = { &envoy_config_accesslog_v3_AccessLog_submsgs[0], &envoy_config_accesslog_v3_AccessLog__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AccessLog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -85,6 +88,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = { &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0], &envoy_config_accesslog_v3_AccessLogFilter__fields[0], UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AccessLogFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -118,6 +124,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = { &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0], &envoy_config_accesslog_v3_ComparisonFilter__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ComparisonFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -136,6 +145,9 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = { &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0], &envoy_config_accesslog_v3_StatusCodeFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.StatusCodeFilter", +#endif }; static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { @@ -150,18 +162,27 @@ const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = { &envoy_config_accesslog_v3_DurationFilter_submsgs[0], &envoy_config_accesslog_v3_DurationFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.DurationFilter", +#endif }; const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.NotHealthCheckFilter", +#endif }; const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.TraceableFilter", +#endif }; static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { @@ -178,6 +199,9 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = { &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0], &envoy_config_accesslog_v3_RuntimeFilter__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.RuntimeFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -198,6 +222,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = { &envoy_config_accesslog_v3_AndFilter_submsgs[0], &envoy_config_accesslog_v3_AndFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AndFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -216,6 +243,9 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = { &envoy_config_accesslog_v3_OrFilter_submsgs[0], &envoy_config_accesslog_v3_OrFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.OrFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -236,6 +266,9 @@ const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = { &envoy_config_accesslog_v3_HeaderFilter_submsgs[0], &envoy_config_accesslog_v3_HeaderFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.HeaderFilter", +#endif }; static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = { @@ -246,6 +279,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init = NULL, &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ResponseFlagFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -261,6 +297,9 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = { NULL, &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.GrpcStatusFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -283,6 +322,9 @@ const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = { &envoy_config_accesslog_v3_MetadataFilter_submsgs[0], &envoy_config_accesslog_v3_MetadataFilter__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.MetadataFilter", +#endif }; static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[2] = { @@ -294,6 +336,9 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = { NULL, &envoy_config_accesslog_v3_LogTypeFilter__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.LogTypeFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -315,6 +360,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = { &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0], &envoy_config_accesslog_v3_ExtensionFilter__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ExtensionFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h index 98a285b79f..dab21d32bc 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h @@ -66,6 +66,7 @@ typedef struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer { upb_Message U typedef struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer; typedef struct envoy_config_bootstrap_v3_LayeredRuntime { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_LayeredRuntime; typedef struct envoy_config_bootstrap_v3_CustomInlineHeader { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_CustomInlineHeader; +typedef struct envoy_config_bootstrap_v3_MemoryAllocatorManager { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_MemoryAllocatorManager; struct envoy_config_accesslog_v3_AccessLog; struct envoy_config_cluster_v3_Cluster; struct envoy_config_core_v3_Address; @@ -146,92 +147,92 @@ typedef enum { envoy_config_bootstrap_v3_Bootstrap_stats_flush_NOT_SET = 0 } envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases; UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases envoy_config_bootstrap_v3_Bootstrap_stats_flush_case(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_node(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_node(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_Node* default_val = NULL; const struct envoy_config_core_v3_Node* ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_node(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_static_resources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_static_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_StaticResources* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_StaticResources* ret; - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_static_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* ret; - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_cluster_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_ClusterManager* default_val = NULL; const envoy_config_bootstrap_v3_ClusterManager* ret; - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_flags_path(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_flags_path(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_metrics_v3_StatsSink* const* envoy_config_bootstrap_v3_Bootstrap_stats_sinks(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -242,7 +243,7 @@ UPB_INLINE const struct envoy_config_metrics_v3_StatsSink* const* envoy_config_b } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -250,7 +251,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_upb return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,191 +260,191 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_mutable_u return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_watchdog(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_watchdog(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Watchdog* default_val = NULL; const envoy_config_bootstrap_v3_Watchdog* ret; - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdog(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_tracing(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_tracing(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_trace_v3_Tracing* default_val = NULL; const struct envoy_config_trace_v3_Tracing* ret; - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_tracing(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_admin(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Admin* default_val = NULL; const envoy_config_bootstrap_v3_Admin* ret; - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_stats_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_metrics_v3_StatsConfig* default_val = NULL; const struct envoy_config_metrics_v3_StatsConfig* ret; - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_hds_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_hds_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_ApiConfigSource* default_val = NULL; const struct envoy_config_core_v3_ApiConfigSource* ret; - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_hds_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_overload_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_overload_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_overload_v3_OverloadManager* default_val = NULL; const struct envoy_config_overload_v3_OverloadManager* ret; - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_overload_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_enable_dispatcher_stats(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_enable_dispatcher_stats(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_layered_runtime(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_LayeredRuntime* default_val = NULL; const envoy_config_bootstrap_v3_LayeredRuntime* ret; - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_header_prefix(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_header_prefix(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_use_tcp_for_dns_lookups(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_use_tcp_for_dns_lookups(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -454,7 +455,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -462,7 +463,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_exten return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -471,11 +472,11 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_ return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* const* envoy_config_bootstrap_v3_Bootstrap_config_sources(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -486,7 +487,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* const* envoy_config_b } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -494,7 +495,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_ return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -503,68 +504,68 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_mutabl return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_config_source(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_default_config_source(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_default_config_source(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_socket_interface(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_default_socket_interface(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_certificate_provider_instances(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE size_t envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_size(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); return map ? _upb_Map_Size(map) : 0; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_get(const envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key, struct envoy_config_core_v3_TypedExtensionConfig** val) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, sizeof(*val)); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry* envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_next(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* iter) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_upb_map(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_mutable_upb_map(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* a) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct envoy_config_core_v3_TypedExtensionConfig*), a); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* envoy_config_bootstrap_v3_Bootstrap_node_context_params(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -575,7 +576,7 @@ UPB_INLINE upb_StringView const* envoy_config_bootstrap_v3_Bootstrap_node_contex } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -583,7 +584,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_pa return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -592,27 +593,27 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_m return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_watchdogs(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_watchdogs(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Watchdogs* default_val = NULL; const envoy_config_bootstrap_v3_Watchdogs* ret; - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdogs(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_FatalAction* const* envoy_config_bootstrap_v3_Bootstrap_fatal_actions(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -623,7 +624,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_FatalAction* const* envoy_config_boot } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -631,7 +632,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_u return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -640,59 +641,59 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_mutable return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_flush_on_admin(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstrap_v3_Bootstrap_dns_resolution_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_DnsResolutionConfig* default_val = NULL; const struct envoy_config_core_v3_DnsResolutionConfig* ret; - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_dns_resolution_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_typed_dns_resolver_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_typed_dns_resolver_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_CustomInlineHeader* const* envoy_config_bootstrap_v3_Bootstrap_inline_headers(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -703,7 +704,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_CustomInlineHeader* const* envoy_conf } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -711,7 +712,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_ return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -720,133 +721,149 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_mutabl return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_perf_tracing_file_path(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_perf_tracing_file_path(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_default_regex_engine(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_default_regex_engine(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_xds_delegate_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_xds_delegate_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_xds_config_tracker_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_xds_config_tracker_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_listener_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_listener_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_listener_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_application_log_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_application_log_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* ret; - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_application_log_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy_config_bootstrap_v3_Bootstrap_deferred_stat_options(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* ret; - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_deferred_stat_options(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* envoy_config_bootstrap_v3_Bootstrap_grpc_async_client_manager_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* ret; - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_grpc_async_client_manager_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_Bootstrap_memory_allocator_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { + const envoy_config_bootstrap_v3_MemoryAllocatorManager* default_val = NULL; + const envoy_config_bootstrap_v3_MemoryAllocatorManager* ret; + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_memory_allocator_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_node(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_Node* value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_mutable_node(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_config_bootstrap_v3_Bootstrap_node(msg); @@ -857,8 +874,8 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_static_resources(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_StaticResources* value) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_mutable_static_resources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)envoy_config_bootstrap_v3_Bootstrap_static_resources(msg); @@ -869,8 +886,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_con return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_DynamicResources* value) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_mutable_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(msg); @@ -881,8 +898,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_co return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_cluster_manager(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_ClusterManager* value) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_mutable_cluster_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_ClusterManager* sub = (struct envoy_config_bootstrap_v3_ClusterManager*)envoy_config_bootstrap_v3_Bootstrap_cluster_manager(msg); @@ -893,11 +910,11 @@ UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_flags_path(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_Bootstrap_mutable_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -908,12 +925,12 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_ } } UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_Bootstrap_resize_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_metrics_v3_StatsSink**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_Bootstrap_add_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -927,8 +944,8 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_B return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap *msg, struct google_protobuf_Duration* value) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(msg); @@ -939,8 +956,8 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_ return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdog(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdog* value) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdog(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Bootstrap_watchdog(msg); @@ -951,8 +968,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_ return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_tracing(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_trace_v3_Tracing* value) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_mutable_tracing(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_trace_v3_Tracing* sub = (struct envoy_config_trace_v3_Tracing*)envoy_config_bootstrap_v3_Bootstrap_tracing(msg); @@ -963,8 +980,8 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Boots return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_admin(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Admin* value) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_mutable_admin(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Admin* sub = (struct envoy_config_bootstrap_v3_Admin*)envoy_config_bootstrap_v3_Bootstrap_admin(msg); @@ -975,8 +992,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Boo return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_metrics_v3_StatsConfig* value) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_metrics_v3_StatsConfig* sub = (struct envoy_config_metrics_v3_StatsConfig*)envoy_config_bootstrap_v3_Bootstrap_stats_config(msg); @@ -987,8 +1004,8 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3 return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_hds_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_ApiConfigSource* value) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_hds_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_hds_config(msg); @@ -999,8 +1016,8 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_overload_manager(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_overload_v3_OverloadManager* value) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_mutable_overload_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_overload_v3_OverloadManager* sub = (struct envoy_config_overload_v3_OverloadManager*)envoy_config_bootstrap_v3_Bootstrap_overload_manager(msg); @@ -1011,12 +1028,12 @@ UPB_INLINE struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_enable_dispatcher_stats(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_LayeredRuntime* value) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_mutable_layered_runtime(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_LayeredRuntime* sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)envoy_config_bootstrap_v3_Bootstrap_layered_runtime(msg); @@ -1027,12 +1044,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_header_prefix(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap *msg, struct google_protobuf_UInt64Value* value) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(msg); @@ -1043,11 +1060,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_use_tcp_for_dns_lookups(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_bootstrap_v3_Bootstrap_mutable_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1058,12 +1075,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_boots } } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_bootstrap_v3_Bootstrap_resize_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_add_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1077,7 +1094,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_Bootstrap_mutable_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1088,12 +1105,12 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_ } } UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_Bootstrap_resize_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_core_v3_ConfigSource**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_add_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1107,8 +1124,8 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_config_source(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_ConfigSource* value) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_default_config_source(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_default_config_source(msg); @@ -1119,36 +1136,36 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_socket_interface(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_clear(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return; _upb_Map_Clear(map); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_set(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key, struct envoy_config_core_v3_TypedExtensionConfig* val, upb_Arena* a) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(val), a); return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) != kUpb_MapInsertStatus_OutOfMemory; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_delete(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Delete(map, &key, 0, NULL); } UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry* envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_nextmutable(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* iter) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_map_next(map, iter); } UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_mutable_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1159,12 +1176,12 @@ UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_mutable_node_cont } } UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_resize_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView val, upb_Arena* arena) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1176,8 +1193,8 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envo return true; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdogs* value) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdogs(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Watchdogs* sub = (struct envoy_config_bootstrap_v3_Watchdogs*)envoy_config_bootstrap_v3_Bootstrap_watchdogs(msg); @@ -1188,7 +1205,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3 return sub; } UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Bootstrap_mutable_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1199,12 +1216,12 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Boo } } UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Bootstrap_resize_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_FatalAction**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_Bootstrap_add_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1218,12 +1235,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_ return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_on_admin(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_bootstrap_v3_Bootstrap_dns_resolution_config(msg); @@ -1234,8 +1251,8 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_typed_dns_resolver_config(msg); @@ -1246,7 +1263,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap_v3_Bootstrap_mutable_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1257,12 +1274,12 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap } } UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap_v3_Bootstrap_resize_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_CustomInlineHeader**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_v3_Bootstrap_add_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1276,12 +1293,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_boo return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_perf_tracing_file_path(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_default_regex_engine(msg); @@ -1292,8 +1309,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_delegate_extension(msg); @@ -1304,8 +1321,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_config_tracker_extension(msg); @@ -1316,8 +1333,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_listener_manager(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_listener_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_listener_manager(msg); @@ -1328,8 +1345,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_application_log_config(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* value) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_application_log_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)envoy_config_bootstrap_v3_Bootstrap_application_log_config(msg); @@ -1340,8 +1357,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envo return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* value) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy_config_bootstrap_v3_Bootstrap_mutable_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* sub = (struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions*)envoy_config_bootstrap_v3_Bootstrap_deferred_stat_options(msg); @@ -1352,8 +1369,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* value) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* sub = (struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig*)envoy_config_bootstrap_v3_Bootstrap_grpc_async_client_manager_config(msg); @@ -1363,6 +1380,18 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConf } return sub; } +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_MemoryAllocatorManager* value) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_Bootstrap_mutable_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { + struct envoy_config_bootstrap_v3_MemoryAllocatorManager* sub = (struct envoy_config_bootstrap_v3_MemoryAllocatorManager*)envoy_config_bootstrap_v3_Bootstrap_memory_allocator_manager(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_MemoryAllocatorManager*)_upb_Message_New(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, arena); + if (sub) envoy_config_bootstrap_v3_Bootstrap_set_memory_allocator_manager(msg, sub); + } + return sub; +} /* envoy.config.bootstrap.v3.Bootstrap.StaticResources */ @@ -1699,7 +1728,7 @@ UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_DynamicResources_c UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_lds_config(msg); @@ -1711,7 +1740,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_cds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_cds_config(msg); @@ -1723,7 +1752,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_ads_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ApiConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_ads_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) { struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_ads_config(msg); @@ -1735,11 +1764,11 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig */ @@ -1797,7 +1826,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_has_log UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_set_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig *msg, envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_mutable_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_log_format(msg); @@ -1889,7 +1918,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogForm UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_set_json_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_mutable_json_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_json_format(msg); @@ -1901,7 +1930,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootstrap_Ap } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_set_text_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions */ @@ -1955,7 +1984,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions_enable_d UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions_set_enable_deferred_creation_stats(envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig */ @@ -2013,7 +2042,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_set_max_cached_entry_idle_duration(envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_mutable_max_cached_entry_idle_duration(envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_max_cached_entry_idle_duration(msg); @@ -2200,15 +2229,15 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Admin_ignore_global_conn_limit(const e UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_access_log_path(envoy_config_bootstrap_v3_Admin *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_profile_path(envoy_config_bootstrap_v3_Admin *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_address(envoy_config_bootstrap_v3_Admin *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_Admin_mutable_address(envoy_config_bootstrap_v3_Admin* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_bootstrap_v3_Admin_address(msg); @@ -2280,7 +2309,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_bootstrap_v3 } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_ignore_global_conn_limit(envoy_config_bootstrap_v3_Admin *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.ClusterManager */ @@ -2394,11 +2423,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_enable_deferred_cluster UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_local_cluster_name(envoy_config_bootstrap_v3_ClusterManager *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_outlier_detection(envoy_config_bootstrap_v3_ClusterManager *msg, envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_mutable_outlier_detection(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)envoy_config_bootstrap_v3_ClusterManager_outlier_detection(msg); @@ -2410,7 +2439,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* env } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_upstream_bind_config(envoy_config_bootstrap_v3_ClusterManager *msg, struct envoy_config_core_v3_BindConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_ClusterManager_mutable_upstream_bind_config(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_bootstrap_v3_ClusterManager_upstream_bind_config(msg); @@ -2422,7 +2451,7 @@ UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_Clu } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_load_stats_config(envoy_config_bootstrap_v3_ClusterManager *msg, struct envoy_config_core_v3_ApiConfigSource* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_ClusterManager_mutable_load_stats_config(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_ClusterManager_load_stats_config(msg); @@ -2434,7 +2463,7 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_enable_deferred_cluster_creation(envoy_config_bootstrap_v3_ClusterManager *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.ClusterManager.OutlierDetection */ @@ -2504,11 +2533,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_has_ev UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_log_path(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_service(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, struct envoy_config_core_v3_EventServiceConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_mutable_event_service(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* msg, upb_Arena* arena) { struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_event_service(msg); @@ -2590,7 +2619,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Watchdogs_has_worker_watchdog(const en UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_main_thread_watchdog(msg); @@ -2602,7 +2631,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_ } UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_worker_watchdog(msg); @@ -2780,7 +2809,7 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Watchdog_actions_mutable_upb_ar UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_miss_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_miss_timeout(msg); @@ -2792,7 +2821,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_megamiss_timeout(msg); @@ -2804,7 +2833,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_kill_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_kill_timeout(msg); @@ -2816,7 +2845,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_multikill_timeout(msg); @@ -2828,7 +2857,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(envoy_config_bootstrap_v3_Watchdog *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_threshold(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_bootstrap_v3_Watchdog_multikill_threshold(msg); @@ -2840,7 +2869,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_muta } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_max_kill_timeout_jitter(msg); @@ -2948,7 +2977,7 @@ UPB_INLINE int32_t envoy_config_bootstrap_v3_Watchdog_WatchdogAction_event(const UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_mutable_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Watchdog_WatchdogAction_config(msg); @@ -2960,7 +2989,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_event(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.FatalAction */ @@ -3018,7 +3047,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_FatalAction_has_config(const envoy_con UPB_INLINE void envoy_config_bootstrap_v3_FatalAction_set_config(envoy_config_bootstrap_v3_FatalAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_FatalAction_mutable_config(envoy_config_bootstrap_v3_FatalAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_FatalAction_config(msg); @@ -3120,19 +3149,19 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Runtime_has_base(const envoy_config_bo UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_symlink_root(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_override_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_base(envoy_config_bootstrap_v3_Runtime *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtime_mutable_base(envoy_config_bootstrap_v3_Runtime* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Runtime_base(msg); @@ -3270,11 +3299,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_rtds_layer(const envo UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer_mutable_static_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_RuntimeLayer_static_layer(msg); @@ -3286,7 +3315,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)envoy_config_bootstrap_v3_RuntimeLayer_disk_layer(msg); @@ -3298,7 +3327,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)envoy_config_bootstrap_v3_RuntimeLayer_admin_layer(msg); @@ -3310,7 +3339,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_confi } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)envoy_config_bootstrap_v3_RuntimeLayer_rtds_layer(msg); @@ -3396,15 +3425,15 @@ UPB_INLINE upb_StringView envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_subdi UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_symlink_root(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_append_service_cluster(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, bool value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_subdirectory(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer */ @@ -3512,11 +3541,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_has_rtds_config UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_rtds_config(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_mutable_rtds_config(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_rtds_config(msg); @@ -3690,11 +3719,93 @@ UPB_INLINE int32_t envoy_config_bootstrap_v3_CustomInlineHeader_inline_header_ty UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_set_inline_header_name(envoy_config_bootstrap_v3_CustomInlineHeader *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_set_inline_header_type(envoy_config_bootstrap_v3_CustomInlineHeader *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.bootstrap.v3.MemoryAllocatorManager */ + +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_new(upb_Arena* arena) { + return (envoy_config_bootstrap_v3_MemoryAllocatorManager*)_upb_Message_New(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_bootstrap_v3_MemoryAllocatorManager* ret = envoy_config_bootstrap_v3_MemoryAllocatorManager_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_bootstrap_v3_MemoryAllocatorManager* ret = envoy_config_bootstrap_v3_MemoryAllocatorManager_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_bootstrap_v3_MemoryAllocatorManager_serialize(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_bootstrap_v3_MemoryAllocatorManager_serialize_ex(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_clear_bytes_to_release(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_bootstrap_v3_MemoryAllocatorManager_bytes_to_release(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_clear_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllocatorManager_memory_release_interval(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_bootstrap_v3_MemoryAllocatorManager_has_memory_release_interval(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_set_bytes_to_release(envoy_config_bootstrap_v3_MemoryAllocatorManager *msg, uint64_t value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_set_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllocatorManager_mutable_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_MemoryAllocatorManager_memory_release_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_bootstrap_v3_MemoryAllocatorManager_set_memory_release_interval(msg, sub); + } + return sub; } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c index 0959ed0b7c..d0a5dd5181 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c @@ -36,7 +36,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[30] = { +static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[31] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init}, @@ -67,53 +67,58 @@ static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[30] = {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init}, -}; - -static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[38] = { - {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init}, +}; + +static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[39] = { + {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { &envoy_config_bootstrap_v3_Bootstrap_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap__fields[0], - UPB_SIZE(184, 336), 38, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(192, 344), 39, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -131,11 +136,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000c00003f000180, &upb_psb1_2bt}, + {0x000d00003f000180, &upb_psb1_2bt}, {0x010800003f00028a, &upb_pss_2bt}, {0x009000003f000192, &upb_pss_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000d00003f0001a0, &upb_psb1_2bt}, + {0x000e00003f0001a0, &upb_psb1_2bt}, {0x00a800003f0e01aa, &upb_prm_2bt_maxmaxb}, {0x00b000003f0f01b2, &upb_prm_2bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -144,7 +149,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { {0x00d800003f0001d2, &upb_prs_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x00e800003f1301e2, &upb_prm_2bt_max64b}, - {0x000b00101d0001e8, &upb_pob1_2bt}, + {0x000c00101d0001e8, &upb_pob1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) @@ -166,6 +171,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.StaticResources", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -192,6 +200,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_ms &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0], UPB_SIZE(40, 72), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.DynamicResources", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -216,6 +227,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = { @@ -231,6 +245,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -247,6 +264,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions NULL, &envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -265,6 +285,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientMana &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { @@ -280,6 +303,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProvider &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -305,6 +331,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = { &envoy_config_bootstrap_v3_Admin_submsgs[0], &envoy_config_bootstrap_v3_Admin__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Admin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -335,6 +364,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = { &envoy_config_bootstrap_v3_ClusterManager_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.ClusterManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -360,6 +392,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetecti &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.ClusterManager.OutlierDetection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -380,6 +415,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = { &envoy_config_bootstrap_v3_Watchdogs_submsgs[0], &envoy_config_bootstrap_v3_Watchdogs__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdogs", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = { @@ -406,6 +444,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = { &envoy_config_bootstrap_v3_Watchdog_submsgs[0], &envoy_config_bootstrap_v3_Watchdog__fields[0], UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -431,6 +472,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_i &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0], &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdog.WatchdogAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -451,6 +495,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = { &envoy_config_bootstrap_v3_FatalAction_submsgs[0], &envoy_config_bootstrap_v3_FatalAction__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.FatalAction", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = { @@ -468,6 +515,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = { &envoy_config_bootstrap_v3_Runtime_submsgs[0], &envoy_config_bootstrap_v3_Runtime__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Runtime", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -495,6 +545,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = { &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -517,6 +570,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_in NULL, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -529,6 +585,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_i NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { @@ -544,6 +603,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_in &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -562,6 +624,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = { &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0], &envoy_config_bootstrap_v3_LayeredRuntime__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.LayeredRuntime", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -577,6 +642,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = NULL, &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.CustomInlineHeader", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -585,7 +653,29 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = }) }; -static const upb_MiniTable *messages_layout[22] = { +static const upb_MiniTableSub envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +}; + +static const upb_MiniTableField envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[2] = { + {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init = { + &envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[0], + &envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[0], + UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.MemoryAllocatorManager", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f000008, &upb_psv8_1bt}, + }) +}; + +static const upb_MiniTable *messages_layout[23] = { &envoy__config__bootstrap__v3__Bootstrap_msg_init, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, @@ -608,13 +698,14 @@ static const upb_MiniTable *messages_layout[22] = { &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, + &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, }; const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout = { messages_layout, NULL, NULL, - 22, + 23, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h index 0bce61ac6b..dbfa51694c 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h @@ -39,6 +39,7 @@ extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLaye extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init; extern const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init; extern const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init; +extern const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init; extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h index b0fe445e28..76cfcddac0 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h @@ -355,11 +355,11 @@ UPB_INLINE bool envoy_config_cluster_v3_CircuitBreakers_Thresholds_has_retry_bud UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_priority(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connections(msg); @@ -371,7 +371,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_pending_requests(msg); @@ -383,7 +383,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_requests(msg); @@ -395,7 +395,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_retries(msg); @@ -407,11 +407,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_track_remaining(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connection_pools(msg); @@ -423,7 +423,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_retry_budget(msg); @@ -505,7 +505,7 @@ UPB_INLINE bool envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_h UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_budget_percent(msg); @@ -517,7 +517,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_min_retry_concurrency(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c index 567fbb039f..8cca6f747f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = { &envoy_config_cluster_v3_CircuitBreakers_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -64,6 +67,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_ &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0], UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers.Thresholds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -90,6 +96,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__Ret &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers.Thresholds.RetryBudget", +#endif }; static const upb_MiniTable *messages_layout[3] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h index bb010b0876..fbf094cd6c 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h @@ -67,6 +67,7 @@ typedef struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntr typedef struct envoy_config_cluster_v3_LoadBalancingPolicy { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_LoadBalancingPolicy; typedef struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_LoadBalancingPolicy_Policy; typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_UpstreamConnectionOptions; +typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig; typedef struct envoy_config_cluster_v3_TrackClusterStats { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_TrackClusterStats; struct envoy_config_cluster_v3_CircuitBreakers; struct envoy_config_cluster_v3_Filter; @@ -153,6 +154,12 @@ typedef enum { envoy_config_cluster_v3_Cluster_RingHashLbConfig_MURMUR_HASH_2 = 1 } envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction; +typedef enum { + envoy_config_cluster_v3_UpstreamConnectionOptions_DEFAULT = 0, + envoy_config_cluster_v3_UpstreamConnectionOptions_V4 = 1, + envoy_config_cluster_v3_UpstreamConnectionOptions_V6 = 2 +} envoy_config_cluster_v3_UpstreamConnectionOptions_FirstAddressFamilyVersion; + /* envoy.config.cluster.v3.ClusterCollection */ @@ -210,7 +217,7 @@ UPB_INLINE bool envoy_config_cluster_v3_ClusterCollection_has_entries(const envo UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct xds_core_v3_CollectionEntry* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_mutable_entries(envoy_config_cluster_v3_ClusterCollection* msg, upb_Arena* arena) { struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)envoy_config_cluster_v3_ClusterCollection_entries(msg); @@ -263,7 +270,7 @@ typedef enum { envoy_config_cluster_v3_Cluster_cluster_discovery_type_NOT_SET = 0 } envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases; UPB_INLINE envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases envoy_config_cluster_v3_Cluster_cluster_discovery_type_case(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return (envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -276,36 +283,36 @@ typedef enum { envoy_config_cluster_v3_Cluster_lb_config_NOT_SET = 0 } envoy_config_cluster_v3_Cluster_lb_config_oneofcases; UPB_INLINE envoy_config_cluster_v3_Cluster_lb_config_oneofcases envoy_config_cluster_v3_Cluster_lb_config_case(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_cluster_v3_Cluster_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_name(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_name(const envoy_config_cluster_v3_Cluster* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_type(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_type(const envoy_config_cluster_v3_Cluster* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_type(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg) { @@ -589,19 +596,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lb_subset_config(const envoy return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_RingHashLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret; - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket(envoy_config_cluster_v3_Cluster* msg) { @@ -665,13 +672,13 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_lb_config(const envoy return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_alt_stat_name(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_alt_stat_name(const envoy_config_cluster_v3_Cluster* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -749,19 +756,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_assignment(const envoy_ return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret; - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_extension_protocol_options(envoy_config_cluster_v3_Cluster* msg) { @@ -794,35 +801,35 @@ UPB_INLINE upb_Map* _envoy_config_cluster_v3_Cluster_typed_extension_protocol_op return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret; - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cluster_type(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_cluster_type(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_CustomClusterType* default_val = NULL; const envoy_config_cluster_v3_Cluster_CustomClusterType* ret; - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cluster_type(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_respect_dns_ttl(envoy_config_cluster_v3_Cluster* msg) { @@ -1050,19 +1057,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_connection_pool_per_downstream_c return ret; } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_MaglevLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret; - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg) { @@ -1114,33 +1121,65 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_typed_dns_resolver_config(co return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret; - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (upb_StringView const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} UPB_INLINE void envoy_config_cluster_v3_Cluster_set_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_type(envoy_config_cluster_v3_Cluster *msg, int32_t value) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_eds_cluster_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_EdsClusterConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_mutable_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)envoy_config_cluster_v3_Cluster_eds_cluster_config(msg); @@ -1152,7 +1191,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connect_timeout(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_connect_timeout(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_connect_timeout(msg); @@ -1164,7 +1203,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(msg); @@ -1176,7 +1215,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_m } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_policy(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_mutable_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1210,7 +1249,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck* envoy_config_cluster_v3_Clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 88), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_max_requests_per_connection(msg); @@ -1222,7 +1261,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_m } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_circuit_breakers(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_mutable_circuit_breakers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_config_cluster_v3_Cluster_circuit_breakers(msg); @@ -1234,7 +1273,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {13, UPB_SIZE(40, 104), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_config_cluster_v3_Cluster_http_protocol_options(msg); @@ -1246,7 +1285,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http2_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 112), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_cluster_v3_Cluster_http2_protocol_options(msg); @@ -1258,7 +1297,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(48, 120), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_dns_refresh_rate(msg); @@ -1270,7 +1309,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_lookup_family(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {17, UPB_SIZE(52, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_mutable_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {18, UPB_SIZE(56, 128), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1304,7 +1343,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_cluster_v3_Cluster_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_outlier_detection(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_OutlierDetection* value) { const upb_MiniTableField field = {19, UPB_SIZE(60, 136), 72, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_mutable_outlier_detection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_OutlierDetection* sub = (struct envoy_config_cluster_v3_OutlierDetection*)envoy_config_cluster_v3_Cluster_outlier_detection(msg); @@ -1316,7 +1355,7 @@ UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cleanup_interval(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {20, UPB_SIZE(64, 144), 73, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_cleanup_interval(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_cleanup_interval(msg); @@ -1328,7 +1367,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_bind_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_BindConfig* value) { const upb_MiniTableField field = {21, UPB_SIZE(68, 152), 74, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_cluster_v3_Cluster_upstream_bind_config(msg); @@ -1340,7 +1379,7 @@ UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Clust } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_subset_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LbSubsetConfig* value) { const upb_MiniTableField field = {22, UPB_SIZE(72, 160), 75, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_mutable_lb_subset_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)envoy_config_cluster_v3_Cluster_lb_subset_config(msg); @@ -1351,8 +1390,8 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RingHashLbConfig* value) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_mutable_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)envoy_config_cluster_v3_Cluster_ring_hash_lb_config(msg); @@ -1364,7 +1403,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_transport_socket(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {24, UPB_SIZE(76, 168), 76, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_mutable_transport_socket(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_transport_socket(msg); @@ -1376,7 +1415,7 @@ UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_metadata(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {25, UPB_SIZE(80, 176), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_mutable_metadata(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_cluster_v3_Cluster_metadata(msg); @@ -1388,11 +1427,11 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_protocol_selection(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {26, UPB_SIZE(84, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig* value) { const upb_MiniTableField field = {27, UPB_SIZE(88, 184), 78, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_mutable_common_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)envoy_config_cluster_v3_Cluster_common_lb_config(msg); @@ -1403,12 +1442,12 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_alt_stat_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) { - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {29, UPB_SIZE(92, 208), 79, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_config_cluster_v3_Cluster_common_http_protocol_options(msg); @@ -1420,7 +1459,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_connection_options(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_UpstreamConnectionOptions* value) { const upb_MiniTableField field = {30, UPB_SIZE(96, 216), 80, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_UpstreamConnectionOptions* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)envoy_config_cluster_v3_Cluster_upstream_connection_options(msg); @@ -1432,15 +1471,15 @@ UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_confi } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(100, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {32, UPB_SIZE(101, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_assignment(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_endpoint_v3_ClusterLoadAssignment* value) { const upb_MiniTableField field = {33, UPB_SIZE(104, 224), 81, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_mutable_load_assignment(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_ClusterLoadAssignment* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)envoy_config_cluster_v3_Cluster_load_assignment(msg); @@ -1451,8 +1490,8 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* value) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_mutable_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)envoy_config_cluster_v3_Cluster_original_dst_lb_config(msg); @@ -1488,8 +1527,8 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* e return (envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_least_request_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* value) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_mutable_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)envoy_config_cluster_v3_Cluster_least_request_lb_config(msg); @@ -1500,8 +1539,8 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_co return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cluster_type(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CustomClusterType* value) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_mutable_cluster_type(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CustomClusterType* sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)envoy_config_cluster_v3_Cluster_cluster_type(msg); @@ -1513,7 +1552,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_confi } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_respect_dns_ttl(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {39, UPB_SIZE(116, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_mutable_filters(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {40, UPB_SIZE(120, 240), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1547,7 +1586,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_balancing_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_LoadBalancingPolicy* value) { const upb_MiniTableField field = {41, UPB_SIZE(124, 248), 82, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_mutable_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_config_cluster_v3_Cluster_load_balancing_policy(msg); @@ -1559,7 +1598,7 @@ UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lrs_server(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {42, UPB_SIZE(128, 256), 83, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_mutable_lrs_server(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_lrs_server(msg); @@ -1601,7 +1640,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_co } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RefreshRate* value) { const upb_MiniTableField field = {44, UPB_SIZE(136, 272), 84, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_mutable_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RefreshRate* sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(msg); @@ -1613,11 +1652,11 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {45, UPB_SIZE(140, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) { const upb_MiniTableField field = {46, UPB_SIZE(144, 280), 85, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(msg); @@ -1629,11 +1668,11 @@ UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_timeout_budgets(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {47, UPB_SIZE(148, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {48, UPB_SIZE(152, 288), 86, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_upstream_config(msg); @@ -1645,7 +1684,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_cluster_stats(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_TrackClusterStats* value) { const upb_MiniTableField field = {49, UPB_SIZE(156, 296), 87, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_mutable_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_TrackClusterStats* sub = (struct envoy_config_cluster_v3_TrackClusterStats*)envoy_config_cluster_v3_Cluster_track_cluster_stats(msg); @@ -1657,7 +1696,7 @@ UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PreconnectPolicy* value) { const upb_MiniTableField field = {50, UPB_SIZE(160, 304), 88, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_mutable_preconnect_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)envoy_config_cluster_v3_Cluster_preconnect_policy(msg); @@ -1669,11 +1708,11 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {51, UPB_SIZE(164, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_maglev_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_MaglevLbConfig* value) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_mutable_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)envoy_config_cluster_v3_Cluster_maglev_lb_config(msg); @@ -1685,7 +1724,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_c } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_resolution_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) { const upb_MiniTableField field = {53, UPB_SIZE(168, 312), 89, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_mutable_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_cluster_v3_Cluster_dns_resolution_config(msg); @@ -1697,7 +1736,7 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {54, UPB_SIZE(172, 320), 90, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mutable_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(msg); @@ -1709,7 +1748,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mut } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {55, UPB_SIZE(176, 328), 91, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(msg); @@ -1720,8 +1759,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* value) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_mutable_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)envoy_config_cluster_v3_Cluster_round_robin_lb_config(msg); @@ -1731,6 +1770,34 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_conf } return sub; } +UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_mutable_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, size_t* size) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (upb_StringView*)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_resize_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE bool envoy_config_cluster_v3_Cluster_add_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, upb_StringView val, upb_Arena* arena) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return false; + } + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); + return true; +} /* envoy.config.cluster.v3.Cluster.TransportSocketMatch */ @@ -1815,11 +1882,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_transpo UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(msg); @@ -1831,7 +1898,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_Transp } UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_transport_socket(msg); @@ -1909,11 +1976,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CustomClusterType_has_typed_conf UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_name(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_mutable_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(msg); @@ -1991,7 +2058,7 @@ UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_EdsClusterConfig_servi UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_mutable_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(msg); @@ -2003,7 +2070,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Clu } UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.LbSubsetConfig */ @@ -2165,11 +2232,11 @@ UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_metadata_fallb UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(msg); @@ -2211,23 +2278,23 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelecto } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(25, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(26, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(27, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector */ @@ -2385,7 +2452,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2417,7 +2484,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.SlowStartConfig */ @@ -2507,7 +2574,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_min_weight_p UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(msg); @@ -2519,7 +2586,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Slow } UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(msg); @@ -2531,7 +2598,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cl } UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(msg); @@ -2597,7 +2664,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_has_slow_star UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(msg); @@ -2695,7 +2762,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_slow_st UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(msg); @@ -2707,7 +2774,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_L } UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(msg); @@ -2719,7 +2786,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cl } UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(msg); @@ -2813,7 +2880,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_maximum_rin UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(msg); @@ -2825,11 +2892,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_R } UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(msg); @@ -2895,7 +2962,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_MaglevLbConfig_has_table_size(co UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_mutable_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(msg); @@ -3001,15 +3068,15 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_has_metadata UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(msg); @@ -3021,7 +3088,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_O } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_metadata_key(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_metadata_key(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_metadata_key(msg); @@ -3201,7 +3268,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_override_host UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(msg); @@ -3213,7 +3280,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonL } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 56), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(msg); @@ -3225,7 +3292,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConf } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 56), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(msg); @@ -3237,7 +3304,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeighte } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(msg); @@ -3249,15 +3316,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Comm } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(25, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(msg); @@ -3269,7 +3336,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashi } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_config_core_v3_HealthStatusSet* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 48), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthStatusSet* sub = (struct envoy_config_core_v3_HealthStatusSet*)envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(msg); @@ -3363,7 +3430,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(msg); @@ -3375,7 +3442,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonL } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(msg); @@ -3387,7 +3454,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_C } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig */ @@ -3495,11 +3562,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashing UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(msg); @@ -3581,7 +3648,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_max_interval(con UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(msg); @@ -3593,7 +3660,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Refr } UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(msg); @@ -3675,7 +3742,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_predictive_ UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) { struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(msg); @@ -3687,7 +3754,7 @@ UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_P } UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) { struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(msg); @@ -3874,7 +3941,7 @@ UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_Policy_has_typed_ext UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_mutable_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(msg); @@ -3949,10 +4016,26 @@ UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_set_local_inte &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_happy_eyeballs_config(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* default_val = NULL; + const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_has_happy_eyeballs_config(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, struct envoy_config_core_v3_TcpKeepalive* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TcpKeepalive* sub = (struct envoy_config_core_v3_TcpKeepalive*)envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(msg); @@ -3964,7 +4047,101 @@ UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_Ups } UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) { + struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)envoy_config_cluster_v3_UpstreamConnectionOptions_happy_eyeballs_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, arena); + if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_set_happy_eyeballs_config(msg, sub); + } + return sub; +} + +/* envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig */ + +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(upb_Arena* arena) { + return (envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, arena); +} +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_serialize(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_serialize_ex(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_clear_first_address_family_version(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_version(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_clear_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_count(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const struct google_protobuf_UInt32Value* default_val = NULL; + const struct google_protobuf_UInt32Value* ret; + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_has_first_address_family_count(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_version(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig *msg, int32_t value) { + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig *msg, struct google_protobuf_UInt32Value* value) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_mutable_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, upb_Arena* arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_count(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena); + if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_count(msg, sub); + } + return sub; } /* envoy.config.cluster.v3.TrackClusterStats */ @@ -4042,15 +4219,15 @@ UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_per_endpoint_stats(con UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_per_endpoint_stats(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {3, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c index 6e9a883eb5..f3ab3dda43 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c @@ -48,6 +48,9 @@ const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = { &envoy_config_cluster_v3_ClusterCollection_submsgs[0], &envoy_config_cluster_v3_ClusterCollection__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.ClusterCollection", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = { @@ -92,9 +95,9 @@ static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { - {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[52] = { + {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(16, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -111,21 +114,21 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { {20, UPB_SIZE(64, 144), 73, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(68, 152), 74, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {22, UPB_SIZE(72, 160), 75, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(76, 168), 76, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(80, 176), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(84, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {27, UPB_SIZE(88, 184), 78, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(92, 208), 79, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(96, 216), 80, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(100, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(101, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(104, 224), 81, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {39, UPB_SIZE(116, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {40, UPB_SIZE(120, 240), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {41, UPB_SIZE(124, 248), 82, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -139,21 +142,25 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { {49, UPB_SIZE(156, 296), 87, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {50, UPB_SIZE(160, 304), 88, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {51, UPB_SIZE(164, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {53, UPB_SIZE(168, 312), 89, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {54, UPB_SIZE(172, 320), 90, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {55, UPB_SIZE(176, 328), 91, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { &envoy_config_cluster_v3_Cluster_submsgs[0], &envoy_config_cluster_v3_Cluster__fields[0], - UPB_SIZE(208, 352), 51, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(216, 360), 52, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002800003f00000a, &upb_pss_1bt}, - {0x0150001c02000010, &upb_pov4_1bt}, + {0x0158001c02000010, &upb_pov4_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -171,12 +178,12 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { {0x001000003f000188, &upb_psv4_2bt}, {0x008000003f090192, &upb_prm_2bt_maxmaxb}, {0x002300003f000398, &upb_psb1_2bt}, - {0x01580024342203a2, &upb_pom_2bt_max64b}, - {0x01580024251702aa, &upb_pom_2bt_max64b}, - {0x0150001c261802b2, &upb_pom_2bt_max64b}, - {0x01580024170e01ba, &upb_pom_2bt_max64b}, + {0x01600024342203a2, &upb_pom_2bt_max64b}, + {0x01600024251702aa, &upb_pom_2bt_max64b}, + {0x0158001c261802b2, &upb_pom_2bt_max64b}, + {0x01600024170e01ba, &upb_pom_2bt_max64b}, {0x00f000003f1902c2, &upb_prm_2bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x015000003f0003ca, &upb_prs_2bt}, {0x001400003f0001d0, &upb_psv4_2bt}, {0x010800003f1c02da, &upb_prm_2bt_max64b}, {0x00c000003f0001e2, &upb_pss_2bt}, @@ -201,6 +208,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_ms &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0], &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.TransportSocketMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -220,6 +230,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_i &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0], &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CustomClusterType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -239,6 +252,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_in &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.EdsClusterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -267,6 +283,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0], UPB_SIZE(32, 40), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LbSubsetConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -298,6 +317,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubse NULL, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, @@ -326,6 +348,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_ini &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.SlowStartConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = { @@ -340,6 +365,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_ &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RoundRobinLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = { @@ -358,6 +386,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_ms &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LeastRequestLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = { @@ -375,6 +406,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_in &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RingHashLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -395,6 +429,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.MaglevLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = { @@ -413,6 +450,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.OriginalDstLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -445,6 +485,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0], UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -472,6 +515,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwa &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -484,6 +530,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Localit NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { @@ -499,6 +548,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Consist &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -519,6 +571,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0], &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RefreshRate", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = { @@ -535,6 +590,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_in &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0], &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.PreconnectPolicy", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { @@ -550,6 +608,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolO &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0], &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -568,6 +629,9 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = { &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.LoadBalancingPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -586,21 +650,29 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_ &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.LoadBalancingPolicy.Policy", +#endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = { +static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TcpKeepalive_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[2] = { +static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[3] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = { &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0], &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.UpstreamConnectionOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -609,6 +681,28 @@ const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_in }) }; +static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +}; + +static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[2] = { + {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init = { + &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[0], + &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000c00003f000008, &upb_psv4_1bt}, + }) +}; + static const upb_MiniTableField envoy_config_cluster_v3_TrackClusterStats__fields[3] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -619,6 +713,9 @@ const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = { NULL, &envoy_config_cluster_v3_TrackClusterStats__fields[0], 16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.TrackClusterStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -627,7 +724,7 @@ const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = { }) }; -static const upb_MiniTable *messages_layout[24] = { +static const upb_MiniTable *messages_layout[25] = { &envoy__config__cluster__v3__ClusterCollection_msg_init, &envoy__config__cluster__v3__Cluster_msg_init, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, @@ -651,6 +748,7 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, + &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, &envoy__config__cluster__v3__TrackClusterStats_msg_init, }; @@ -658,7 +756,7 @@ const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout = messages_layout, NULL, NULL, - 24, + 25, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h index e6bca85838..2227e30e56 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h @@ -40,6 +40,7 @@ extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionPr extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init; +extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init; extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h index 3c922804b8..fef044bb2e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h @@ -114,11 +114,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Filter_has_config_discovery(const envoy_ UPB_INLINE void envoy_config_cluster_v3_Filter_set_name(envoy_config_cluster_v3_Filter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Filter_set_typed_config(envoy_config_cluster_v3_Filter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_typed_config(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Filter_typed_config(msg); @@ -130,7 +130,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_ty } UPB_INLINE void envoy_config_cluster_v3_Filter_set_config_discovery(envoy_config_cluster_v3_Filter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_cluster_v3_Filter_mutable_config_discovery(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_cluster_v3_Filter_config_discovery(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c index 8579ce77f6..097a3c17a8 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = { &envoy_config_cluster_v3_Filter_submsgs[0], &envoy_config_cluster_v3_Filter__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Filter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h index 128b6e4b30..ac14f9b4c5 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h @@ -12,6 +12,7 @@ #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +#include "envoy/config/core/v3/extension.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/wrappers.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" @@ -26,6 +27,7 @@ extern "C" { #endif typedef struct envoy_config_cluster_v3_OutlierDetection { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_OutlierDetection; +struct envoy_config_core_v3_TypedExtensionConfig; struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; @@ -432,10 +434,58 @@ UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_successful_active_h const upb_MiniTableField field = {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_monitors(envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_cluster_v3_OutlierDetection_monitors(const envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (const struct envoy_config_core_v3_TypedExtensionConfig* const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_cluster_v3_OutlierDetection_monitors_upb_array(const envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_cluster_v3_OutlierDetection_monitors_mutable_upb_array(envoy_config_cluster_v3_OutlierDetection* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_always_eject_one_host(const envoy_config_cluster_v3_OutlierDetection* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_always_eject_one_host(const envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_5xx(msg); @@ -447,7 +497,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_interval(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_interval(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_interval(msg); @@ -459,7 +509,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_base_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_base_ejection_time(msg); @@ -471,7 +521,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_max_ejection_percent(msg); @@ -483,7 +533,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_5xx(msg); @@ -495,7 +545,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_success_rate(msg); @@ -507,7 +557,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_minimum_hosts(msg); @@ -519,7 +569,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_request_volume(msg); @@ -531,7 +581,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_stdev_factor(msg); @@ -543,7 +593,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_gateway_failure(msg); @@ -555,7 +605,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_gateway_failure(msg); @@ -567,11 +617,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_split_external_local_origin_errors(envoy_config_cluster_v3_OutlierDetection *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(56, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {13, UPB_SIZE(60, 104), 75, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_local_origin_failure(msg); @@ -583,7 +633,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {14, UPB_SIZE(64, 112), 76, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_local_origin_failure(msg); @@ -595,7 +645,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {15, UPB_SIZE(68, 120), 77, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_local_origin_success_rate(msg); @@ -607,7 +657,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(72, 128), 78, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_threshold(msg); @@ -619,7 +669,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {17, UPB_SIZE(76, 136), 79, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage(msg); @@ -631,7 +681,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {18, UPB_SIZE(80, 144), 80, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage_local_origin(msg); @@ -643,7 +693,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {19, UPB_SIZE(84, 152), 81, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_minimum_hosts(msg); @@ -655,7 +705,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {20, UPB_SIZE(88, 160), 82, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_request_volume(msg); @@ -667,7 +717,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {21, UPB_SIZE(92, 168), 83, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time(msg); @@ -679,7 +729,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_jitter(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {22, UPB_SIZE(96, 176), 84, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time_jitter(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time_jitter(msg); @@ -691,7 +741,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_successful_active_health_check_uneject_host(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_mutable_successful_active_health_check_uneject_host(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_OutlierDetection_successful_active_health_check_uneject_host(msg); @@ -701,6 +751,48 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDete } return sub; } +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_cluster_v3_OutlierDetection_mutable_monitors(envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_cluster_v3_OutlierDetection_resize_monitors(envoy_config_cluster_v3_OutlierDetection* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_OutlierDetection_add_monitors(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return NULL; + } + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (!arr || !sub) return NULL; + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); + return sub; +} +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_mutable_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_OutlierDetection_always_eject_one_host(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_cluster_v3_OutlierDetection_set_always_eject_one_host(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c index 9cc2c69ffb..8c8d43f17d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c @@ -8,6 +8,7 @@ #include #include "upb/generated_code_support.h" #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +#include "envoy/config/core/v3/extension.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/wrappers.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" @@ -17,7 +18,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[22] = { +static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[24] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -40,9 +41,11 @@ static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[2 {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[23] = { +static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[25] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -66,12 +69,17 @@ static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields {21, UPB_SIZE(92, 168), 83, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {22, UPB_SIZE(96, 176), 84, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { &envoy_config_cluster_v3_OutlierDetection_submsgs[0], &envoy_config_cluster_v3_OutlierDetection__fields[0], - UPB_SIZE(104, 192), 23, kUpb_ExtMode_NonExtendable, 23, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(112, 208), 25, kUpb_ExtMode_NonExtendable, 25, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.OutlierDetection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -89,6 +97,22 @@ const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x00c000003f1601c2, &upb_prm_2bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h index 18716ac763..5a8d513a15 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h @@ -143,7 +143,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_on_no_match(const env UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_list(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_mutable_matcher_list(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)envoy_config_common_matcher_v3_Matcher_matcher_list(msg); @@ -155,7 +155,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_conf } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_tree(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_mutable_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)envoy_config_common_matcher_v3_Matcher_matcher_tree(msg); @@ -167,7 +167,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_conf } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_on_no_match(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_mutable_on_no_match(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_on_no_match(msg); @@ -259,7 +259,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_action(const UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, envoy_config_common_matcher_v3_Matcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher* sub = (struct envoy_config_common_matcher_v3_Matcher*)envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(msg); @@ -271,7 +271,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_ma } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_OnMatch_action(msg); @@ -497,7 +497,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg); @@ -509,7 +509,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_S } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg); @@ -521,7 +521,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_P } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg); @@ -533,7 +533,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_P } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg); @@ -641,7 +641,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Sin UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg); @@ -653,7 +653,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg); @@ -665,7 +665,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_match } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg); @@ -847,7 +847,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg); @@ -859,7 +859,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg); @@ -984,7 +984,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_custom_ma UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_input(msg); @@ -996,7 +996,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* e } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg); @@ -1020,7 +1020,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* e } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(msg); @@ -1361,7 +1361,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_or_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_or_match(msg); @@ -1373,7 +1373,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_and_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_and_match(msg); @@ -1385,7 +1385,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_not_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_mutable_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_common_matcher_v3_MatchPredicate_not_match(msg); @@ -1397,11 +1397,11 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_co } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_any_match(envoy_config_common_matcher_v3_MatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(msg); @@ -1413,7 +1413,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(msg); @@ -1425,7 +1425,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(msg); @@ -1437,7 +1437,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(msg); @@ -1449,7 +1449,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(msg); @@ -1461,7 +1461,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_con } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(msg); @@ -1755,7 +1755,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patte UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1869,11 +1869,11 @@ UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextM UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c index 6438446764..e7c5e693ea 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = { &envoy_config_common_matcher_v3_Matcher_submsgs[0], &envoy_config_common_matcher_v3_Matcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_ini &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0], &envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.OnMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -75,6 +81,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -99,6 +108,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -127,6 +139,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -147,6 +162,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -167,6 +185,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Fi &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher", +#endif }; static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = { @@ -187,6 +208,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -211,6 +235,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap", +#endif }; static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { @@ -226,6 +253,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -261,6 +291,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0], &envoy_config_common_matcher_v3_MatchPredicate__fields[0], UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.MatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -293,6 +326,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0], &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.MatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -311,6 +347,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_ini &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0], &envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpHeadersMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -330,6 +369,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0], &envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpGenericBodyMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -347,6 +389,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__Ge NULL, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h index f8d0c4a51d..0c40c12617 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h @@ -111,11 +111,11 @@ UPB_INLINE uint32_t envoy_config_core_v3_Pipe_mode(const envoy_config_core_v3_Pi UPB_INLINE void envoy_config_core_v3_Pipe_set_path(envoy_config_core_v3_Pipe *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Pipe_set_mode(envoy_config_core_v3_Pipe *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.EnvoyInternalAddress */ @@ -194,11 +194,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_EnvoyInternalAddress_endpoint_id( UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_server_listener_name(envoy_config_core_v3_EnvoyInternalAddress *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_endpoint_id(envoy_config_core_v3_EnvoyInternalAddress *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SocketAddress */ @@ -330,27 +330,27 @@ UPB_INLINE bool envoy_config_core_v3_SocketAddress_ipv4_compat(const envoy_confi UPB_INLINE void envoy_config_core_v3_SocketAddress_set_protocol(envoy_config_core_v3_SocketAddress *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_address(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_port_value(envoy_config_core_v3_SocketAddress *msg, uint32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), -13, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_named_port(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_resolver_name(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_ipv4_compat(envoy_config_core_v3_SocketAddress *msg, bool value) { const upb_MiniTableField field = {6, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.TcpKeepalive */ @@ -440,7 +440,7 @@ UPB_INLINE bool envoy_config_core_v3_TcpKeepalive_has_keepalive_interval(const e UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_probes(msg); @@ -452,7 +452,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive } UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_time(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_time(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_time(msg); @@ -464,7 +464,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive } UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_interval(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_interval(msg); @@ -546,7 +546,7 @@ UPB_INLINE bool envoy_config_core_v3_ExtraSourceAddress_has_socket_options(const UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_address(envoy_config_core_v3_ExtraSourceAddress *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_ExtraSourceAddress_mutable_address(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_ExtraSourceAddress_address(msg); @@ -558,7 +558,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Extra } UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_socket_options(envoy_config_core_v3_ExtraSourceAddress *msg, struct envoy_config_core_v3_SocketOptionsOverride* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_ExtraSourceAddress_mutable_socket_options(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_core_v3_ExtraSourceAddress_socket_options(msg); @@ -752,7 +752,7 @@ UPB_INLINE bool envoy_config_core_v3_BindConfig_has_local_address_selector(const UPB_INLINE void envoy_config_core_v3_BindConfig_set_source_address(envoy_config_core_v3_BindConfig *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindConfig_mutable_source_address(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_BindConfig_source_address(msg); @@ -764,7 +764,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindC } UPB_INLINE void envoy_config_core_v3_BindConfig_set_freebind(envoy_config_core_v3_BindConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_BindConfig_mutable_freebind(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_BindConfig_freebind(msg); @@ -866,7 +866,7 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ } UPB_INLINE void envoy_config_core_v3_BindConfig_set_local_address_selector(envoy_config_core_v3_BindConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_BindConfig_mutable_local_address_selector(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_BindConfig_local_address_selector(msg); @@ -975,7 +975,7 @@ UPB_INLINE bool envoy_config_core_v3_Address_has_envoy_internal_address(const en UPB_INLINE void envoy_config_core_v3_Address_set_socket_address(envoy_config_core_v3_Address *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Address_mutable_socket_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_Address_socket_address(msg); @@ -987,7 +987,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Addre } UPB_INLINE void envoy_config_core_v3_Address_set_pipe(envoy_config_core_v3_Address *msg, envoy_config_core_v3_Pipe* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutable_pipe(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_Pipe* sub = (struct envoy_config_core_v3_Pipe*)envoy_config_core_v3_Address_pipe(msg); @@ -999,7 +999,7 @@ UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutabl } UPB_INLINE void envoy_config_core_v3_Address_set_envoy_internal_address(envoy_config_core_v3_Address *msg, envoy_config_core_v3_EnvoyInternalAddress* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Address_mutable_envoy_internal_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_EnvoyInternalAddress* sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)envoy_config_core_v3_Address_envoy_internal_address(msg); @@ -1077,11 +1077,11 @@ UPB_INLINE bool envoy_config_core_v3_CidrRange_has_prefix_len(const envoy_config UPB_INLINE void envoy_config_core_v3_CidrRange_set_address_prefix(envoy_config_core_v3_CidrRange *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_CidrRange_set_prefix_len(envoy_config_core_v3_CidrRange *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mutable_prefix_len(envoy_config_core_v3_CidrRange* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_CidrRange_prefix_len(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c index af6548e146..339a591cde 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__Pipe_msg_init = { NULL, &envoy_config_core_v3_Pipe__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Pipe", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -45,6 +48,9 @@ const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init = { NULL, &envoy_config_core_v3_EnvoyInternalAddress__fields[0], UPB_SIZE(32, 48), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.EnvoyInternalAddress", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -66,6 +72,9 @@ const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = { NULL, &envoy_config_core_v3_SocketAddress__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketAddress", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -94,6 +103,9 @@ const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = { &envoy_config_core_v3_TcpKeepalive_submsgs[0], &envoy_config_core_v3_TcpKeepalive__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TcpKeepalive", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = { @@ -110,6 +122,9 @@ const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = { &envoy_config_core_v3_ExtraSourceAddress_submsgs[0], &envoy_config_core_v3_ExtraSourceAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ExtraSourceAddress", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[6] = { @@ -134,6 +149,9 @@ const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = { &envoy_config_core_v3_BindConfig_submsgs[0], &envoy_config_core_v3_BindConfig__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BindConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -162,6 +180,9 @@ const upb_MiniTable envoy__config__core__v3__Address_msg_init = { &envoy_config_core_v3_Address_submsgs[0], &envoy_config_core_v3_Address__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Address", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, @@ -183,6 +204,9 @@ const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = { &envoy_config_core_v3_CidrRange_submsgs[0], &envoy_config_core_v3_CidrRange__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.CidrRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h index a90189121d..0fc5ece510 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h @@ -100,7 +100,7 @@ UPB_INLINE bool envoy_config_core_v3_BackoffStrategy_has_max_interval(const envo UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_base_interval(envoy_config_core_v3_BackoffStrategy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_base_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_base_interval(msg); @@ -112,7 +112,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy } UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_max_interval(envoy_config_core_v3_BackoffStrategy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_max_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_max_interval(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c index d8251ee5cc..4805979ead 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = { &envoy_config_core_v3_BackoffStrategy_submsgs[0], &envoy_config_core_v3_BackoffStrategy__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BackoffStrategy", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h index 8d245d4860..0ea85ae0c4 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h @@ -46,6 +46,9 @@ typedef struct envoy_config_core_v3_RuntimeUInt32 { upb_Message UPB_PRIVATE(base typedef struct envoy_config_core_v3_RuntimePercent { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimePercent; typedef struct envoy_config_core_v3_RuntimeDouble { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimeDouble; typedef struct envoy_config_core_v3_RuntimeFeatureFlag { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimeFeatureFlag; +typedef struct envoy_config_core_v3_KeyValue { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValue; +typedef struct envoy_config_core_v3_KeyValueAppend { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValueAppend; +typedef struct envoy_config_core_v3_KeyValueMutation { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValueMutation; typedef struct envoy_config_core_v3_QueryParameter { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_QueryParameter; typedef struct envoy_config_core_v3_HeaderValue { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HeaderValue; typedef struct envoy_config_core_v3_HeaderValueOption { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HeaderValueOption; @@ -53,6 +56,8 @@ typedef struct envoy_config_core_v3_HeaderMap { upb_Message UPB_PRIVATE(base); } typedef struct envoy_config_core_v3_WatchedDirectory { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_WatchedDirectory; typedef struct envoy_config_core_v3_DataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_DataSource; typedef struct envoy_config_core_v3_RetryPolicy { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy; +typedef struct envoy_config_core_v3_RetryPolicy_RetryPriority { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy_RetryPriority; +typedef struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy_RetryHostPredicate; typedef struct envoy_config_core_v3_RemoteDataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RemoteDataSource; typedef struct envoy_config_core_v3_AsyncDataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_AsyncDataSource; typedef struct envoy_config_core_v3_TransportSocket { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_TransportSocket; @@ -77,6 +82,13 @@ typedef enum { envoy_config_core_v3_HeaderValueOption_OVERWRITE_IF_EXISTS = 3 } envoy_config_core_v3_HeaderValueOption_HeaderAppendAction; +typedef enum { + envoy_config_core_v3_KeyValueAppend_APPEND_IF_EXISTS_OR_ADD = 0, + envoy_config_core_v3_KeyValueAppend_ADD_IF_ABSENT = 1, + envoy_config_core_v3_KeyValueAppend_OVERWRITE_IF_EXISTS_OR_ADD = 2, + envoy_config_core_v3_KeyValueAppend_OVERWRITE_IF_EXISTS = 3 +} envoy_config_core_v3_KeyValueAppend_KeyValueAppendAction; + typedef enum { envoy_config_core_v3_METHOD_UNSPECIFIED = 0, envoy_config_core_v3_GET = 1, @@ -178,15 +190,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_Locality_sub_zone(const envoy_con UPB_INLINE void envoy_config_core_v3_Locality_set_region(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Locality_set_zone(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Locality_set_sub_zone(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.BuildVersion */ @@ -260,7 +272,7 @@ UPB_INLINE bool envoy_config_core_v3_BuildVersion_has_metadata(const envoy_confi UPB_INLINE void envoy_config_core_v3_BuildVersion_set_version(envoy_config_core_v3_BuildVersion *msg, struct envoy_type_v3_SemanticVersion* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_BuildVersion_mutable_version(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) { struct envoy_type_v3_SemanticVersion* sub = (struct envoy_type_v3_SemanticVersion*)envoy_config_core_v3_BuildVersion_version(msg); @@ -272,7 +284,7 @@ UPB_INLINE struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_BuildVersi } UPB_INLINE void envoy_config_core_v3_BuildVersion_set_metadata(envoy_config_core_v3_BuildVersion *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_BuildVersion_mutable_metadata(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_BuildVersion_metadata(msg); @@ -418,19 +430,19 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_Extension_type_urls_mutable_upb_arra UPB_INLINE void envoy_config_core_v3_Extension_set_name(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_category(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_type_descriptor(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_version(envoy_config_core_v3_Extension *msg, envoy_config_core_v3_BuildVersion* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extension_mutable_version(envoy_config_core_v3_Extension* msg, upb_Arena* arena) { struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Extension_version(msg); @@ -442,7 +454,7 @@ UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extens } UPB_INLINE void envoy_config_core_v3_Extension_set_disabled(envoy_config_core_v3_Extension *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_Extension_mutable_type_urls(envoy_config_core_v3_Extension* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -747,15 +759,15 @@ UPB_INLINE upb_Map* _envoy_config_core_v3_Node_dynamic_parameters_mutable_upb_ma UPB_INLINE void envoy_config_core_v3_Node_set_id(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_cluster(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_metadata(envoy_config_core_v3_Node *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_Node_mutable_metadata(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_Node_metadata(msg); @@ -767,7 +779,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_Node_mutable_meta } UPB_INLINE void envoy_config_core_v3_Node_set_locality(envoy_config_core_v3_Node *msg, envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 72), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_core_v3_Node_mutable_locality(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_core_v3_Node_locality(msg); @@ -779,15 +791,15 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_core_v3_Node_mutab } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_name(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(64, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_version(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(40, 16), UPB_SIZE(-21, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_build_version(envoy_config_core_v3_Node *msg, envoy_config_core_v3_BuildVersion* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 16), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Node_mutable_user_agent_build_version(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Node_user_agent_build_version(msg); @@ -1183,11 +1195,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeUInt32_runtime_key(const e UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_default_value(envoy_config_core_v3_RuntimeUInt32 *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_runtime_key(envoy_config_core_v3_RuntimeUInt32 *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimePercent */ @@ -1257,7 +1269,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimePercent_runtime_key(const UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_default_value(envoy_config_core_v3_RuntimePercent *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_mutable_default_value(envoy_config_core_v3_RuntimePercent* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_RuntimePercent_default_value(msg); @@ -1269,7 +1281,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_mut } UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_runtime_key(envoy_config_core_v3_RuntimePercent *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimeDouble */ @@ -1335,11 +1347,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeDouble_runtime_key(const e UPB_INLINE void envoy_config_core_v3_RuntimeDouble_set_default_value(envoy_config_core_v3_RuntimeDouble *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RuntimeDouble_set_runtime_key(envoy_config_core_v3_RuntimeDouble *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimeFeatureFlag */ @@ -1409,7 +1421,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeFeatureFlag_runtime_key(co UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_default_value(envoy_config_core_v3_RuntimeFeatureFlag *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeFeatureFlag_mutable_default_value(envoy_config_core_v3_RuntimeFeatureFlag* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_RuntimeFeatureFlag_default_value(msg); @@ -1421,7 +1433,241 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeFeature } UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_runtime_key(envoy_config_core_v3_RuntimeFeatureFlag *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValue */ + +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValue*)_upb_Message_New(&envoy__config__core__v3__KeyValue_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValue* ret = envoy_config_core_v3_KeyValue_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValue_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValue* ret = envoy_config_core_v3_KeyValue_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValue_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValue_serialize(const envoy_config_core_v3_KeyValue* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValue_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValue_serialize_ex(const envoy_config_core_v3_KeyValue* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValue_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValue_clear_key(envoy_config_core_v3_KeyValue* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValue_key(const envoy_config_core_v3_KeyValue* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_KeyValue_clear_value(envoy_config_core_v3_KeyValue* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValue_value(const envoy_config_core_v3_KeyValue* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValue_set_key(envoy_config_core_v3_KeyValue *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_KeyValue_set_value(envoy_config_core_v3_KeyValue *msg, upb_StringView value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValueAppend */ + +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValueAppend*)_upb_Message_New(&envoy__config__core__v3__KeyValueAppend_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValueAppend* ret = envoy_config_core_v3_KeyValueAppend_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueAppend_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValueAppend* ret = envoy_config_core_v3_KeyValueAppend_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueAppend_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueAppend_serialize(const envoy_config_core_v3_KeyValueAppend* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueAppend_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueAppend_serialize_ex(const envoy_config_core_v3_KeyValueAppend* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueAppend_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_clear_entry(envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValueAppend_entry(const envoy_config_core_v3_KeyValueAppend* msg) { + const envoy_config_core_v3_KeyValue* default_val = NULL; + const envoy_config_core_v3_KeyValue* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_KeyValueAppend_has_entry(const envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_clear_action(envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t envoy_config_core_v3_KeyValueAppend_action(const envoy_config_core_v3_KeyValueAppend* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_set_entry(envoy_config_core_v3_KeyValueAppend *msg, envoy_config_core_v3_KeyValue* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValueAppend_mutable_entry(envoy_config_core_v3_KeyValueAppend* msg, upb_Arena* arena) { + struct envoy_config_core_v3_KeyValue* sub = (struct envoy_config_core_v3_KeyValue*)envoy_config_core_v3_KeyValueAppend_entry(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_KeyValue*)_upb_Message_New(&envoy__config__core__v3__KeyValue_msg_init, arena); + if (sub) envoy_config_core_v3_KeyValueAppend_set_entry(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_set_action(envoy_config_core_v3_KeyValueAppend *msg, int32_t value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValueMutation */ + +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValueMutation*)_upb_Message_New(&envoy__config__core__v3__KeyValueMutation_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValueMutation* ret = envoy_config_core_v3_KeyValueMutation_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueMutation_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValueMutation* ret = envoy_config_core_v3_KeyValueMutation_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueMutation_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueMutation_serialize(const envoy_config_core_v3_KeyValueMutation* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueMutation_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueMutation_serialize_ex(const envoy_config_core_v3_KeyValueMutation* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueMutation_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_clear_append(envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueMutation_append(const envoy_config_core_v3_KeyValueMutation* msg) { + const envoy_config_core_v3_KeyValueAppend* default_val = NULL; + const envoy_config_core_v3_KeyValueAppend* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_KeyValueMutation_has_append(const envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_clear_remove(envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValueMutation_remove(const envoy_config_core_v3_KeyValueMutation* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_set_append(envoy_config_core_v3_KeyValueMutation *msg, envoy_config_core_v3_KeyValueAppend* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueMutation_mutable_append(envoy_config_core_v3_KeyValueMutation* msg, upb_Arena* arena) { + struct envoy_config_core_v3_KeyValueAppend* sub = (struct envoy_config_core_v3_KeyValueAppend*)envoy_config_core_v3_KeyValueMutation_append(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_KeyValueAppend*)_upb_Message_New(&envoy__config__core__v3__KeyValueAppend_msg_init, arena); + if (sub) envoy_config_core_v3_KeyValueMutation_set_append(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_set_remove(envoy_config_core_v3_KeyValueMutation *msg, upb_StringView value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.QueryParameter */ @@ -1487,11 +1733,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_QueryParameter_value(const envoy_ UPB_INLINE void envoy_config_core_v3_QueryParameter_set_key(envoy_config_core_v3_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_QueryParameter_set_value(envoy_config_core_v3_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderValue */ @@ -1569,15 +1815,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_HeaderValue_raw_value(const envoy UPB_INLINE void envoy_config_core_v3_HeaderValue_set_key(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValue_set_value(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValue_set_raw_value(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderValueOption */ @@ -1675,7 +1921,7 @@ UPB_INLINE bool envoy_config_core_v3_HeaderValueOption_keep_empty_value(const en UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_header(envoy_config_core_v3_HeaderValueOption *msg, envoy_config_core_v3_HeaderValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValueOption_mutable_header(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) { struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)envoy_config_core_v3_HeaderValueOption_header(msg); @@ -1687,7 +1933,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderV } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_append(envoy_config_core_v3_HeaderValueOption *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderValueOption_mutable_append(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HeaderValueOption_append(msg); @@ -1699,11 +1945,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderValueOpt } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_append_action(envoy_config_core_v3_HeaderValueOption *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_keep_empty_value(envoy_config_core_v3_HeaderValueOption *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderMap */ @@ -1857,7 +2103,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_WatchedDirectory_path(const envoy UPB_INLINE void envoy_config_core_v3_WatchedDirectory_set_path(envoy_config_core_v3_WatchedDirectory *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.DataSource */ @@ -1904,90 +2150,118 @@ typedef enum { envoy_config_core_v3_DataSource_specifier_NOT_SET = 0 } envoy_config_core_v3_DataSource_specifier_oneofcases; UPB_INLINE envoy_config_core_v3_DataSource_specifier_oneofcases envoy_config_core_v3_DataSource_specifier_case(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_DataSource_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_filename(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_filename(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_filename(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_inline_bytes(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_inline_bytes(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_inline_bytes(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_inline_string(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_inline_string(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_inline_string(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_environment_variable(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_environment_variable(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_environment_variable(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_DataSource_clear_watched_directory(envoy_config_core_v3_DataSource* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_DataSource_watched_directory(const envoy_config_core_v3_DataSource* msg) { + const envoy_config_core_v3_WatchedDirectory* default_val = NULL; + const envoy_config_core_v3_WatchedDirectory* ret; + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_DataSource_has_watched_directory(const envoy_config_core_v3_DataSource* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_set_filename(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_inline_bytes(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_inline_string(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_environment_variable(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_DataSource_set_watched_directory(envoy_config_core_v3_DataSource *msg, envoy_config_core_v3_WatchedDirectory* value) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_DataSource_mutable_watched_directory(envoy_config_core_v3_DataSource* msg, upb_Arena* arena) { + struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_DataSource_watched_directory(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena); + if (sub) envoy_config_core_v3_DataSource_set_watched_directory(msg, sub); + } + return sub; } /* envoy.config.core.v3.RetryPolicy */ @@ -2058,10 +2332,82 @@ UPB_INLINE bool envoy_config_core_v3_RetryPolicy_has_num_retries(const envoy_con const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_on(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_retry_on(const envoy_config_core_v3_RetryPolicy* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_priority(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_retry_priority(const envoy_config_core_v3_RetryPolicy* msg) { + const envoy_config_core_v3_RetryPolicy_RetryPriority* default_val = NULL; + const envoy_config_core_v3_RetryPolicy_RetryPriority* ret; + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_has_retry_priority(const envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* const* envoy_config_core_v3_RetryPolicy_retry_host_predicate(const envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_core_v3_RetryPolicy_retry_host_predicate_upb_array(const envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_core_v3_RetryPolicy_retry_host_predicate_mutable_upb_array(envoy_config_core_v3_RetryPolicy* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_host_selection_retry_max_attempts(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int64_t envoy_config_core_v3_RetryPolicy_host_selection_retry_max_attempts(const envoy_config_core_v3_RetryPolicy* msg) { + int64_t default_val = (int64_t)0ll; + int64_t ret; + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_back_off(envoy_config_core_v3_RetryPolicy *msg, struct envoy_config_core_v3_BackoffStrategy* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_RetryPolicy_mutable_retry_back_off(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_BackoffStrategy* sub = (struct envoy_config_core_v3_BackoffStrategy*)envoy_config_core_v3_RetryPolicy_retry_back_off(msg); @@ -2073,7 +2419,7 @@ UPB_INLINE struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_Ret } UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_num_retries(envoy_config_core_v3_RetryPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_mutable_num_retries(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RetryPolicy_num_retries(msg); @@ -2083,6 +2429,238 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_ } return sub; } +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_on(envoy_config_core_v3_RetryPolicy *msg, upb_StringView value) { + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_priority(envoy_config_core_v3_RetryPolicy *msg, envoy_config_core_v3_RetryPolicy_RetryPriority* value) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_mutable_retry_priority(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { + struct envoy_config_core_v3_RetryPolicy_RetryPriority* sub = (struct envoy_config_core_v3_RetryPolicy_RetryPriority*)envoy_config_core_v3_RetryPolicy_retry_priority(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_set_retry_priority(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate** envoy_config_core_v3_RetryPolicy_mutable_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate**)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate** envoy_config_core_v3_RetryPolicy_resize_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_add_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return NULL; + } + struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate* sub = (struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, arena); + if (!arr || !sub) return NULL; + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); + return sub; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_host_selection_retry_max_attempts(envoy_config_core_v3_RetryPolicy *msg, int64_t value) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.RetryPolicy.RetryPriority */ + +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_new(upb_Arena* arena) { + return (envoy_config_core_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryPriority* ret = envoy_config_core_v3_RetryPolicy_RetryPriority_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryPriority* ret = envoy_config_core_v3_RetryPolicy_RetryPriority_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryPriority_serialize(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryPriority_serialize_ex(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, options, arena, &ptr, len); + return ptr; +} +typedef enum { + envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_typed_config = 2, + envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_NOT_SET = 0 +} envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases; +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_case(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases)upb_Message_WhichOneofFieldNumber( + UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_clear_name(envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_RetryPriority_name(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_clear_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryPriority_typed_config(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const struct google_protobuf_Any* default_val = NULL; + const struct google_protobuf_Any* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_RetryPriority_has_typed_config(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_set_name(envoy_config_core_v3_RetryPolicy_RetryPriority *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_set_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority *msg, struct google_protobuf_Any* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryPriority_mutable_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_RetryPolicy_RetryPriority_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_RetryPriority_set_typed_config(msg, sub); + } + return sub; +} + +/* envoy.config.core.v3.RetryPolicy.RetryHostPredicate */ + +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(upb_Arena* arena) { + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_serialize(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_serialize_ex(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, options, arena, &ptr, len); + return ptr; +} +typedef enum { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_typed_config = 2, + envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_NOT_SET = 0 +} envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases; +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_case(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases)upb_Message_WhichOneofFieldNumber( + UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_clear_name(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_RetryHostPredicate_name(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_clear_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_typed_config(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const struct google_protobuf_Any* default_val = NULL; + const struct google_protobuf_Any* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_RetryHostPredicate_has_typed_config(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_name(envoy_config_core_v3_RetryPolicy_RetryHostPredicate *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate *msg, struct google_protobuf_Any* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_mutable_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_RetryPolicy_RetryHostPredicate_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_typed_config(msg, sub); + } + return sub; +} /* envoy.config.core.v3.RemoteDataSource */ @@ -2167,7 +2745,7 @@ UPB_INLINE bool envoy_config_core_v3_RemoteDataSource_has_retry_policy(const env UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_http_uri(envoy_config_core_v3_RemoteDataSource *msg, struct envoy_config_core_v3_HttpUri* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_RemoteDataSource_mutable_http_uri(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_config_core_v3_RemoteDataSource_http_uri(msg); @@ -2179,11 +2757,11 @@ UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_RemoteDataS } UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_sha256(envoy_config_core_v3_RemoteDataSource *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_retry_policy(envoy_config_core_v3_RemoteDataSource *msg, envoy_config_core_v3_RetryPolicy* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RemoteDataSource_mutable_retry_policy(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_RemoteDataSource_retry_policy(msg); @@ -2275,7 +2853,7 @@ UPB_INLINE bool envoy_config_core_v3_AsyncDataSource_has_remote(const envoy_conf UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_local(envoy_config_core_v3_AsyncDataSource *msg, envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncDataSource_mutable_local(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_AsyncDataSource_local(msg); @@ -2287,7 +2865,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncDat } UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_remote(envoy_config_core_v3_AsyncDataSource *msg, envoy_config_core_v3_RemoteDataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_AsyncDataSource_mutable_remote(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RemoteDataSource* sub = (struct envoy_config_core_v3_RemoteDataSource*)envoy_config_core_v3_AsyncDataSource_remote(msg); @@ -2374,11 +2952,11 @@ UPB_INLINE bool envoy_config_core_v3_TransportSocket_has_typed_config(const envo UPB_INLINE void envoy_config_core_v3_TransportSocket_set_name(envoy_config_core_v3_TransportSocket *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_TransportSocket_set_typed_config(envoy_config_core_v3_TransportSocket *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TransportSocket_mutable_typed_config(envoy_config_core_v3_TransportSocket* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TransportSocket_typed_config(msg); @@ -2456,7 +3034,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeFractionalPercent_runtime_ UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_default_value(envoy_config_core_v3_RuntimeFractionalPercent *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_RuntimeFractionalPercent_mutable_default_value(envoy_config_core_v3_RuntimeFractionalPercent* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_core_v3_RuntimeFractionalPercent_default_value(msg); @@ -2468,7 +3046,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_RuntimeF } UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_runtime_key(envoy_config_core_v3_RuntimeFractionalPercent *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.ControlPlane */ @@ -2522,7 +3100,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_ControlPlane_identifier(const env UPB_INLINE void envoy_config_core_v3_ControlPlane_set_identifier(envoy_config_core_v3_ControlPlane *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c index 970af4d9bd..5a71016b20 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__core__v3__Locality_msg_init = { NULL, &envoy_config_core_v3_Locality__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Locality", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = { &envoy_config_core_v3_BuildVersion_submsgs[0], &envoy_config_core_v3_BuildVersion__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BuildVersion", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = { @@ -77,6 +83,9 @@ const upb_MiniTable envoy__config__core__v3__Extension_msg_init = { &envoy_config_core_v3_Extension_submsgs[0], &envoy_config_core_v3_Extension__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Extension", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -116,6 +125,9 @@ const upb_MiniTable envoy__config__core__v3__Node_msg_init = { &envoy_config_core_v3_Node_submsgs[0], &envoy_config_core_v3_Node__fields[0], UPB_SIZE(72, 128), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Node", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -149,6 +161,9 @@ const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_in &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0], &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Node.DynamicParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -169,6 +184,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = { &envoy_config_core_v3_Metadata_submsgs[0], &envoy_config_core_v3_Metadata__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { @@ -184,6 +202,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_i &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata.FilterMetadataEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -203,6 +224,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_ &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata.TypedFilterMetadataEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -218,6 +242,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = { NULL, &envoy_config_core_v3_RuntimeUInt32__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeUInt32", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -239,6 +266,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = { &envoy_config_core_v3_RuntimePercent_submsgs[0], &envoy_config_core_v3_RuntimePercent__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimePercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -256,6 +286,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = { NULL, &envoy_config_core_v3_RuntimeDouble__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeDouble", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -277,6 +310,77 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = { &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0], &envoy_config_core_v3_RuntimeFeatureFlag__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeFeatureFlag", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001800003f000012, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValue__fields[2] = { + {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init = { + NULL, + &envoy_config_core_v3_KeyValue__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValue", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f00000a, &upb_pss_1bt}, + {0x001800003f000012, &upb_psb_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_KeyValueAppend_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValueAppend__fields[2] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = { + &envoy_config_core_v3_KeyValueAppend_submsgs[0], + &envoy_config_core_v3_KeyValueAppend__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValueAppend", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000c00003f000010, &upb_psv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_KeyValueMutation_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValueMutation__fields[2] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init = { + &envoy_config_core_v3_KeyValueMutation_submsgs[0], + &envoy_config_core_v3_KeyValueMutation__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValueMutation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -294,6 +398,9 @@ const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init = { NULL, &envoy_config_core_v3_QueryParameter__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QueryParameter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -312,6 +419,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = { NULL, &envoy_config_core_v3_HeaderValue__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -336,6 +446,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = { &envoy_config_core_v3_HeaderValueOption_submsgs[0], &envoy_config_core_v3_HeaderValueOption__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderValueOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -360,6 +473,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = { &envoy_config_core_v3_HeaderMap_submsgs[0], &envoy_config_core_v3_HeaderMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderMap", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -374,49 +490,127 @@ const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = { NULL, &envoy_config_core_v3_WatchedDirectory__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.WatchedDirectory", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, }) }; -static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[4] = { - {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableSub envoy_config_core_v3_DataSource_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[5] = { + {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = { - NULL, + &envoy_config_core_v3_DataSource_submsgs[0], &envoy_config_core_v3_DataSource__fields[0], - UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x001000080100000a, &upb_pos_1bt}, - {0x0010000802000012, &upb_pob_1bt}, - {0x001000080300001a, &upb_pos_1bt}, - {0x0010000804000022, &upb_pos_1bt}, + {0x0010000c0100000a, &upb_pos_1bt}, + {0x0010000c02000012, &upb_pob_1bt}, + {0x0010000c0300001a, &upb_pos_1bt}, + {0x0010000c04000022, &upb_pos_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; -static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[2] = { +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BackoffStrategy_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = { +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[6] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = { &envoy_config_core_v3_RetryPolicy_submsgs[0], &envoy_config_core_v3_RetryPolicy__fields[0], - UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x002000003f00001a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003800003f03002a, &upb_prm_1bt_max64b}, + {0x004000003f000030, &upb_psv8_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryPriority__fields[2] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init = { + &envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[0], + &envoy_config_core_v3_RetryPolicy_RetryPriority__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy.RetryPriority", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x0020000802000012, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[2] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init = { + &envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[0], + &envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy.RetryHostPredicate", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x0020000802000012, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) }; static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = { @@ -434,6 +628,9 @@ const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = { &envoy_config_core_v3_RemoteDataSource_submsgs[0], &envoy_config_core_v3_RemoteDataSource__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RemoteDataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -456,6 +653,9 @@ const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = { &envoy_config_core_v3_AsyncDataSource_submsgs[0], &envoy_config_core_v3_AsyncDataSource__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AsyncDataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -477,6 +677,9 @@ const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = { &envoy_config_core_v3_TransportSocket_submsgs[0], &envoy_config_core_v3_TransportSocket__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TransportSocket", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -498,6 +701,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0], &envoy_config_core_v3_RuntimeFractionalPercent__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeFractionalPercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -514,13 +720,16 @@ const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init = { NULL, &envoy_config_core_v3_ControlPlane__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ControlPlane", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, }) }; -static const upb_MiniTable *messages_layout[24] = { +static const upb_MiniTable *messages_layout[29] = { &envoy__config__core__v3__Locality_msg_init, &envoy__config__core__v3__BuildVersion_msg_init, &envoy__config__core__v3__Extension_msg_init, @@ -533,6 +742,9 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__core__v3__RuntimePercent_msg_init, &envoy__config__core__v3__RuntimeDouble_msg_init, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, + &envoy__config__core__v3__KeyValue_msg_init, + &envoy__config__core__v3__KeyValueAppend_msg_init, + &envoy__config__core__v3__KeyValueMutation_msg_init, &envoy__config__core__v3__QueryParameter_msg_init, &envoy__config__core__v3__HeaderValue_msg_init, &envoy__config__core__v3__HeaderValueOption_msg_init, @@ -540,6 +752,8 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__core__v3__WatchedDirectory_msg_init, &envoy__config__core__v3__DataSource_msg_init, &envoy__config__core__v3__RetryPolicy_msg_init, + &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, + &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, &envoy__config__core__v3__RemoteDataSource_msg_init, &envoy__config__core__v3__AsyncDataSource_msg_init, &envoy__config__core__v3__TransportSocket_msg_init, @@ -551,7 +765,7 @@ const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout = { messages_layout, NULL, NULL, - 24, + 29, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h index 0db4cef77a..aa613f8aa0 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h @@ -29,6 +29,9 @@ extern const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init; extern const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init; extern const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init; extern const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init; @@ -36,6 +39,8 @@ extern const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init; extern const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init; extern const upb_MiniTable envoy__config__core__v3__DataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init; +extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init; +extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init; extern const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h index d80790375c..4b5f4faa0a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h @@ -283,7 +283,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ApiConfigSource_config_validators_mu UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_api_type(envoy_config_core_v3_ApiConfigSource *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_ApiConfigSource_mutable_cluster_names(envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -315,7 +315,7 @@ UPB_INLINE bool envoy_config_core_v3_ApiConfigSource_add_cluster_names(envoy_con } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_refresh_delay(envoy_config_core_v3_ApiConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_refresh_delay(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_refresh_delay(msg); @@ -357,7 +357,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_ApiConf } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_request_timeout(envoy_config_core_v3_ApiConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_request_timeout(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_request_timeout(msg); @@ -369,7 +369,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(envoy_config_core_v3_ApiConfigSource *msg, envoy_config_core_v3_RateLimitSettings* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_ApiConfigSource_mutable_rate_limit_settings(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RateLimitSettings* sub = (struct envoy_config_core_v3_RateLimitSettings*)envoy_config_core_v3_ApiConfigSource_rate_limit_settings(msg); @@ -381,11 +381,11 @@ UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_A } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_set_node_on_first_message_only(envoy_config_core_v3_ApiConfigSource *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_transport_api_version(envoy_config_core_v3_ApiConfigSource *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_ApiConfigSource_mutable_config_validators(envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(44, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -507,7 +507,7 @@ UPB_INLINE int32_t envoy_config_core_v3_SelfConfigSource_transport_api_version(c UPB_INLINE void envoy_config_core_v3_SelfConfigSource_set_transport_api_version(envoy_config_core_v3_SelfConfigSource *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RateLimitSettings */ @@ -581,7 +581,7 @@ UPB_INLINE bool envoy_config_core_v3_RateLimitSettings_has_fill_rate(const envoy UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_max_tokens(envoy_config_core_v3_RateLimitSettings *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSettings_mutable_max_tokens(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RateLimitSettings_max_tokens(msg); @@ -593,7 +593,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSet } UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_fill_rate(envoy_config_core_v3_RateLimitSettings *msg, struct google_protobuf_DoubleValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSettings_mutable_fill_rate(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) { struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_core_v3_RateLimitSettings_fill_rate(msg); @@ -671,11 +671,11 @@ UPB_INLINE bool envoy_config_core_v3_PathConfigSource_has_watched_directory(cons UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_path(envoy_config_core_v3_PathConfigSource *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_watched_directory(envoy_config_core_v3_PathConfigSource *msg, struct envoy_config_core_v3_WatchedDirectory* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_PathConfigSource_mutable_watched_directory(envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_PathConfigSource_watched_directory(msg); @@ -878,11 +878,11 @@ UPB_INLINE bool envoy_config_core_v3_ConfigSource_has_path_config_source(const e UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path(envoy_config_core_v3_ConfigSource *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_api_config_source(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_ApiConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ConfigSource_mutable_api_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_core_v3_ConfigSource_api_config_source(msg); @@ -894,7 +894,7 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_Con } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_ads(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_AggregatedConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_ConfigSource_mutable_ads(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_AggregatedConfigSource* sub = (struct envoy_config_core_v3_AggregatedConfigSource*)envoy_config_core_v3_ConfigSource_ads(msg); @@ -906,7 +906,7 @@ UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(envoy_config_core_v3_ConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mutable_initial_fetch_timeout(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ConfigSource_initial_fetch_timeout(msg); @@ -918,7 +918,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mu } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_self(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_SelfConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_ConfigSource_mutable_self(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_SelfConfigSource* sub = (struct envoy_config_core_v3_SelfConfigSource*)envoy_config_core_v3_ConfigSource_self(msg); @@ -930,7 +930,7 @@ UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_Co } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_resource_api_version(envoy_config_core_v3_ConfigSource *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_Authority** envoy_config_core_v3_ConfigSource_mutable_authorities(envoy_config_core_v3_ConfigSource* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(24, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -964,7 +964,7 @@ UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_a } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path_config_source(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_PathConfigSource* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_ConfigSource_mutable_path_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_PathConfigSource* sub = (struct envoy_config_core_v3_PathConfigSource*)envoy_config_core_v3_ConfigSource_path_config_source(msg); @@ -1090,7 +1090,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ExtensionConfigSource_type_urls_muta UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_config_source(envoy_config_core_v3_ExtensionConfigSource *msg, envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ExtensionConfigSource_mutable_config_source(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_core_v3_ExtensionConfigSource_config_source(msg); @@ -1102,7 +1102,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_Extens } UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_default_config(envoy_config_core_v3_ExtensionConfigSource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSource_mutable_default_config(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_ExtensionConfigSource_default_config(msg); @@ -1114,7 +1114,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSourc } UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_apply_default_config_without_warming(envoy_config_core_v3_ExtensionConfigSource *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_ExtensionConfigSource_mutable_type_urls(envoy_config_core_v3_ExtensionConfigSource* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c index 046c4f2cef..079e87514b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c @@ -47,6 +47,9 @@ const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = { &envoy_config_core_v3_ApiConfigSource_submsgs[0], &envoy_config_core_v3_ApiConfigSource__fields[0], UPB_SIZE(48, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ApiConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -71,6 +74,9 @@ const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AggregatedConfigSource", +#endif }; static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1] = { @@ -81,6 +87,9 @@ const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = { NULL, &envoy_config_core_v3_SelfConfigSource__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SelfConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -101,6 +110,9 @@ const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = { &envoy_config_core_v3_RateLimitSettings_submsgs[0], &envoy_config_core_v3_RateLimitSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RateLimitSettings", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = { @@ -116,6 +128,9 @@ const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = { &envoy_config_core_v3_PathConfigSource_submsgs[0], &envoy_config_core_v3_PathConfigSource__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.PathConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -146,6 +161,9 @@ const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = { &envoy_config_core_v3_ConfigSource_submsgs[0], &envoy_config_core_v3_ConfigSource__fields[0], UPB_SIZE(40, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pos_1bt}, @@ -182,6 +200,9 @@ const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = { &envoy_config_core_v3_ExtensionConfigSource_submsgs[0], &envoy_config_core_v3_ExtensionConfigSource__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ExtensionConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h index a4ac4fc6fe..75df840700 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_config_core_v3_EventServiceConfig_has_grpc_service(const e UPB_INLINE void envoy_config_core_v3_EventServiceConfig_set_grpc_service(envoy_config_core_v3_EventServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventServiceConfig_mutable_grpc_service(envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_core_v3_EventServiceConfig_grpc_service(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c index 2c8e623e41..7447b9d991 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = { &envoy_config_core_v3_EventServiceConfig_submsgs[0], &envoy_config_core_v3_EventServiceConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.EventServiceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h index f201dab221..27331c9f62 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h @@ -95,11 +95,11 @@ UPB_INLINE bool envoy_config_core_v3_TypedExtensionConfig_has_typed_config(const UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_name(envoy_config_core_v3_TypedExtensionConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_typed_config(envoy_config_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_mutable_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TypedExtensionConfig_typed_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c index 188b6e1eff..25fa2c135f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = { &envoy_config_core_v3_TypedExtensionConfig_submsgs[0], &envoy_config_core_v3_TypedExtensionConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TypedExtensionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h index e32d47daa5..6ced698c81 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h @@ -211,7 +211,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcMethodList_Service_method_names_ UPB_INLINE void envoy_config_core_v3_GrpcMethodList_Service_set_name(envoy_config_core_v3_GrpcMethodList_Service *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_GrpcMethodList_Service_mutable_method_names(envoy_config_core_v3_GrpcMethodList_Service* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c index e3c1784e3e..266ad8a027 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = { &envoy_config_core_v3_GrpcMethodList_submsgs[0], &envoy_config_core_v3_GrpcMethodList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcMethodList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -42,6 +45,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init = NULL, &envoy_config_core_v3_GrpcMethodList_Service__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcMethodList.Service", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h index 1e11aa0bf4..c77f0b5286 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h @@ -97,40 +97,40 @@ typedef enum { envoy_config_core_v3_GrpcService_target_specifier_NOT_SET = 0 } envoy_config_core_v3_GrpcService_target_specifier_oneofcases; UPB_INLINE envoy_config_core_v3_GrpcService_target_specifier_oneofcases envoy_config_core_v3_GrpcService_target_specifier_case(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_GrpcService_target_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_envoy_grpc(envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_envoy_grpc(const envoy_config_core_v3_GrpcService* msg) { const envoy_config_core_v3_GrpcService_EnvoyGrpc* default_val = NULL; const envoy_config_core_v3_GrpcService_EnvoyGrpc* ret; - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_GrpcService_has_envoy_grpc(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_google_grpc(envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_google_grpc(const envoy_config_core_v3_GrpcService* msg) { const envoy_config_core_v3_GrpcService_GoogleGrpc* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc* ret; - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_GrpcService_has_google_grpc(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_timeout(envoy_config_core_v3_GrpcService* msg) { @@ -181,10 +181,26 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcService_initial_metadata_mutable } return arr; } +UPB_INLINE void envoy_config_core_v3_GrpcService_clear_retry_policy(envoy_config_core_v3_GrpcService* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_retry_policy(const envoy_config_core_v3_GrpcService* msg) { + const struct envoy_config_core_v3_RetryPolicy* default_val = NULL; + const struct envoy_config_core_v3_RetryPolicy* ret; + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_has_retry_policy(const envoy_config_core_v3_GrpcService* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_GrpcService_set_envoy_grpc(envoy_config_core_v3_GrpcService *msg, envoy_config_core_v3_GrpcService_EnvoyGrpc* value) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_mutable_envoy_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_EnvoyGrpc* sub = (struct envoy_config_core_v3_GrpcService_EnvoyGrpc*)envoy_config_core_v3_GrpcService_envoy_grpc(msg); @@ -195,8 +211,8 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_ return sub; } UPB_INLINE void envoy_config_core_v3_GrpcService_set_google_grpc(envoy_config_core_v3_GrpcService *msg, envoy_config_core_v3_GrpcService_GoogleGrpc* value) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_mutable_google_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc*)envoy_config_core_v3_GrpcService_google_grpc(msg); @@ -208,7 +224,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core } UPB_INLINE void envoy_config_core_v3_GrpcService_set_timeout(envoy_config_core_v3_GrpcService *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_GrpcService_mutable_timeout(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_GrpcService_timeout(msg); @@ -248,6 +264,18 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcSer (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_GrpcService_set_retry_policy(envoy_config_core_v3_GrpcService *msg, struct envoy_config_core_v3_RetryPolicy* value) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_mutable_retry_policy(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { + struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_GrpcService_retry_policy(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena); + if (sub) envoy_config_core_v3_GrpcService_set_retry_policy(msg, sub); + } + return sub; +} /* envoy.config.core.v3.GrpcService.EnvoyGrpc */ @@ -286,25 +314,25 @@ UPB_INLINE char* envoy_config_core_v3_GrpcService_EnvoyGrpc_serialize_ex(const e return ptr; } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_cluster_name(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_EnvoyGrpc_cluster_name(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_authority(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_EnvoyGrpc_authority(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -325,18 +353,46 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_has_retry_policy(cons const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_EnvoyGrpc_max_receive_message_length(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const struct google_protobuf_UInt32Value* default_val = NULL; + const struct google_protobuf_UInt32Value* ret; + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_has_max_receive_message_length(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_skip_envoy_headers(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_skip_envoy_headers(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_cluster_name(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, upb_StringView value) { - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_authority(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_retry_policy(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, struct envoy_config_core_v3_RetryPolicy* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_EnvoyGrpc_mutable_retry_policy(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_GrpcService_EnvoyGrpc_retry_policy(msg); @@ -346,6 +402,22 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcSer } return sub; } +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, struct google_protobuf_UInt32Value* value) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_EnvoyGrpc_mutable_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_GrpcService_EnvoyGrpc_max_receive_message_length(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena); + if (sub) envoy_config_core_v3_GrpcService_EnvoyGrpc_set_max_receive_message_length(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_skip_envoy_headers(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, bool value) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.core.v3.GrpcService.GoogleGrpc */ @@ -518,11 +590,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_has_channel_args(con UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_target_uri(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_credentials(msg); @@ -564,15 +636,15 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* e } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_stat_prefix(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_credentials_factory_name(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_config(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 80), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_config(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_GrpcService_GoogleGrpc_config(msg); @@ -584,7 +656,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_GrpcService_Googl } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_per_stream_buffer_limit_bytes(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 88), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_per_stream_buffer_limit_bytes(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_GrpcService_GoogleGrpc_per_stream_buffer_limit_bytes(msg); @@ -596,7 +668,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_args(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 96), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_args(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_args(msg); @@ -694,7 +766,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_has_c UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_root_certs(msg); @@ -706,7 +778,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcServ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_private_key(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_private_key(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_private_key(msg); @@ -718,7 +790,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcServ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_cert_chain(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_cert_chain(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_cert_chain(msg); @@ -865,7 +937,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_h UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_ssl_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_ssl_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_ssl_credentials(msg); @@ -877,7 +949,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* en } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_google_default(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_google_default(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_google_default(msg); @@ -889,7 +961,7 @@ UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_Google } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_local_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_local_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_local_credentials(msg); @@ -1066,11 +1138,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_has_ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_access_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_compute_engine(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_compute_engine(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_compute_engine(msg); @@ -1082,11 +1154,11 @@ UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_Google } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_refresh_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_service_account_jwt_access(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_service_account_jwt_access(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_service_account_jwt_access(msg); @@ -1098,7 +1170,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Se } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_iam(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_iam(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_iam(msg); @@ -1110,7 +1182,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Go } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_from_plugin(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_from_plugin(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_from_plugin(msg); @@ -1122,7 +1194,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Me } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_sts_service(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_sts_service(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_sts_service(msg); @@ -1196,11 +1268,11 @@ UPB_INLINE uint64_t envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_set_json_key(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_set_token_lifetime_seconds(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials */ @@ -1266,11 +1338,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_GoogleGrpc_CallCreden UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_set_authorization_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_set_authority_selector(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin */ @@ -1349,11 +1421,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Meta UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_set_name(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_set_typed_config(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_mutable_typed_config(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_typed_config(msg); @@ -1511,39 +1583,39 @@ UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_GoogleGrpc_CallCreden UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_token_exchange_service_uri(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_resource(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_audience(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_scope(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_requested_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_subject_token_path(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_subject_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_actor_token_path(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(64, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_actor_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(72, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs */ @@ -1719,11 +1791,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_ha UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_set_string_value(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_set_int_value(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c index 26d102c207..c26c29c47a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c @@ -22,28 +22,33 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[4] = { +static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[4] = { - {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = { + {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { &envoy_config_core_v3_GrpcService_submsgs[0], &envoy_config_core_v3_GrpcService__fields[0], - UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0020000c0100000a, &upb_pom_1bt_max64b}, - {0x0020000c02010012, &upb_pom_1bt_max128b}, + {0x0028000c0100000a, &upb_pom_1bt_max128b}, + {0x0028000c02010012, &upb_pom_1bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f03002a, &upb_prm_1bt_maxmaxb}, @@ -52,25 +57,35 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[1] = { +static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[3] = { - {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[5] = { + {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = { &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0], &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0], - UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.EnvoyGrpc", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, {0x002000003f000012, &upb_pss_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000900003f000028, &upb_psb1_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -97,6 +112,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0], UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -125,12 +143,18 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredent &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.SslCredentials", +#endif }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.GoogleLocalCredentials", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { @@ -149,6 +173,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -179,6 +206,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -200,6 +230,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.ServiceAccountJWTAccessCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -217,6 +250,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -238,6 +274,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -262,6 +301,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[0], UPB_SIZE(80, 152), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.StsService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -294,6 +336,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs", +#endif }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = { @@ -305,6 +350,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -326,6 +374,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h index 071c44d83a..a43753f21b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h @@ -15,6 +15,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "envoy/config/core/v3/event_service_config.upb_minitable.h" #include "envoy/config/core/v3/extension.upb_minitable.h" +#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/v3/http.upb_minitable.h" #include "envoy/type/v3/range.upb_minitable.h" @@ -45,6 +46,7 @@ typedef struct envoy_config_core_v3_HealthCheck_CustomHealthCheck { upb_Message typedef struct envoy_config_core_v3_HealthCheck_TlsOptions { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HealthCheck_TlsOptions; struct envoy_config_core_v3_EventServiceConfig; struct envoy_config_core_v3_HeaderValueOption; +struct envoy_config_core_v3_ProxyProtocolConfig; struct envoy_config_core_v3_TypedExtensionConfig; struct envoy_type_matcher_v3_StringMatcher; struct envoy_type_v3_Int64Range; @@ -208,7 +210,7 @@ typedef enum { envoy_config_core_v3_HealthCheck_health_checker_NOT_SET = 0 } envoy_config_core_v3_HealthCheck_health_checker_oneofcases; UPB_INLINE envoy_config_core_v3_HealthCheck_health_checker_oneofcases envoy_config_core_v3_HealthCheck_health_checker_case(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_HealthCheck_health_checker_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -325,51 +327,51 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_reuse_connection(const envo return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_http_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_http_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_HttpHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_HttpHealthCheck* ret; - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_http_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_tcp_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_tcp_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_TcpHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_TcpHealthCheck* ret; - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_tcp_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_grpc_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_grpc_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* ret; - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_grpc_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_no_traffic_interval(envoy_config_core_v3_HealthCheck* msg) { @@ -389,19 +391,19 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_no_traffic_interval(const e return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_custom_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_custom_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_CustomHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_CustomHealthCheck* ret; - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_custom_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_unhealthy_interval(envoy_config_core_v3_HealthCheck* msg) { @@ -453,13 +455,13 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_healthy_edge_interval(const return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_event_log_path(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_HealthCheck_event_log_path(const envoy_config_core_v3_HealthCheck* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -600,10 +602,22 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_event_logger_mutable_upb } return arr; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_always_log_health_check_success(envoy_config_core_v3_HealthCheck* msg) { + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_HealthCheck_always_log_health_check_success(const envoy_config_core_v3_HealthCheck* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_HealthCheck_set_timeout(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_timeout(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_timeout(msg); @@ -615,7 +629,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval(msg); @@ -627,7 +641,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval_jitter(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval_jitter(msg); @@ -639,7 +653,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_threshold(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_unhealthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_unhealthy_threshold(msg); @@ -651,7 +665,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_threshold(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_healthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_healthy_threshold(msg); @@ -663,7 +677,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_alt_port(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_alt_port(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_alt_port(msg); @@ -675,7 +689,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_reuse_connection(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 72), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mutable_reuse_connection(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HealthCheck_reuse_connection(msg); @@ -686,8 +700,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mu return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_http_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_HttpHealthCheck* value) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_http_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_HttpHealthCheck*)envoy_config_core_v3_HealthCheck_http_health_check(msg); @@ -698,8 +712,8 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tcp_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_TcpHealthCheck* value) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_tcp_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_TcpHealthCheck*)envoy_config_core_v3_HealthCheck_tcp_health_check(msg); @@ -710,8 +724,8 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_ return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_grpc_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_GrpcHealthCheck* value) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_mutable_grpc_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)envoy_config_core_v3_HealthCheck_grpc_health_check(msg); @@ -723,7 +737,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 80), 71, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_no_traffic_interval(msg); @@ -734,8 +748,8 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_custom_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_CustomHealthCheck* value) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_mutable_custom_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_CustomHealthCheck*)envoy_config_core_v3_HealthCheck_custom_health_check(msg); @@ -747,7 +761,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_conf } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 88), 72, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_interval(msg); @@ -759,7 +773,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_edge_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {15, UPB_SIZE(52, 96), 73, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_edge_interval(msg); @@ -771,7 +785,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_edge_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(56, 104), 74, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_healthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_healthy_edge_interval(msg); @@ -782,20 +796,20 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_event_log_path(envoy_config_core_v3_HealthCheck *msg, upb_StringView value) { - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval_jitter_percent(envoy_config_core_v3_HealthCheck *msg, uint32_t value) { const upb_MiniTableField field = {18, UPB_SIZE(60, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_always_log_health_check_failures(envoy_config_core_v3_HealthCheck *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(64, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_initial_jitter(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {20, UPB_SIZE(68, 128), 75, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_initial_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_initial_jitter(msg); @@ -807,7 +821,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tls_options(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_TlsOptions* value) { const upb_MiniTableField field = {21, UPB_SIZE(72, 136), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_HealthCheck_mutable_tls_options(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_TlsOptions* sub = (struct envoy_config_core_v3_HealthCheck_TlsOptions*)envoy_config_core_v3_HealthCheck_tls_options(msg); @@ -819,7 +833,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_event_service(envoy_config_core_v3_HealthCheck *msg, struct envoy_config_core_v3_EventServiceConfig* value) { const upb_MiniTableField field = {22, UPB_SIZE(76, 144), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_HealthCheck_mutable_event_service(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_core_v3_HealthCheck_event_service(msg); @@ -831,7 +845,7 @@ UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_transport_socket_match_criteria(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {23, UPB_SIZE(80, 152), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutable_transport_socket_match_criteria(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_HealthCheck_transport_socket_match_criteria(msg); @@ -843,7 +857,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutab } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(84, 160), 79, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_no_traffic_healthy_interval(msg); @@ -883,6 +897,10 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_set_always_log_health_check_success(envoy_config_core_v3_HealthCheck *msg, bool value) { + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.core.v3.HealthCheck.Payload */ @@ -965,11 +983,11 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_Payload_has_binary(const envoy_ UPB_INLINE void envoy_config_core_v3_HealthCheck_Payload_set_text(envoy_config_core_v3_HealthCheck_Payload *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_Payload_set_binary(envoy_config_core_v3_HealthCheck_Payload *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HealthCheck.HttpHealthCheck */ @@ -1267,15 +1285,15 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_HttpHealthCheck_has_response_bu UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_host(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_path(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(60, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_send(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, envoy_config_core_v3_HealthCheck_Payload* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_send(msg); @@ -1405,11 +1423,11 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_codec_client_type(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, int32_t value) { const upb_MiniTableField field = {10, UPB_SIZE(32, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_service_name_matcher(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {11, UPB_SIZE(36, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_service_name_matcher(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_service_name_matcher(msg); @@ -1451,11 +1469,11 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_method(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, int32_t value) { const upb_MiniTableField field = {13, UPB_SIZE(44, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_response_buffer_size(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 112), 66, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_response_buffer_size(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_response_buffer_size(msg); @@ -1550,10 +1568,26 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_TcpHealthCheck_receive_m } return arr; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_clear_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_HealthCheck_TcpHealthCheck_proxy_protocol_config(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const struct envoy_config_core_v3_ProxyProtocolConfig* default_val = NULL; + const struct envoy_config_core_v3_ProxyProtocolConfig* ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_HealthCheck_TcpHealthCheck_has_proxy_protocol_config(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck *msg, envoy_config_core_v3_HealthCheck_Payload* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_TcpHealthCheck_send(msg); @@ -1593,6 +1627,18 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck *msg, struct envoy_config_core_v3_ProxyProtocolConfig* value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) { + struct envoy_config_core_v3_ProxyProtocolConfig* sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)envoy_config_core_v3_HealthCheck_TcpHealthCheck_proxy_protocol_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolConfig_msg_init, arena); + if (sub) envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_proxy_protocol_config(msg, sub); + } + return sub; +} /* envoy.config.core.v3.HealthCheck.RedisHealthCheck */ @@ -1645,7 +1691,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_HealthCheck_RedisHealthCheck_key( UPB_INLINE void envoy_config_core_v3_HealthCheck_RedisHealthCheck_set_key(envoy_config_core_v3_HealthCheck_RedisHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HealthCheck.GrpcHealthCheck */ @@ -1743,11 +1789,11 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_GrpcHealthCheck_initial_ UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_set_service_name(envoy_config_core_v3_HealthCheck_GrpcHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_set_authority(envoy_config_core_v3_HealthCheck_GrpcHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_HealthCheck_GrpcHealthCheck_mutable_initial_metadata(envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1856,11 +1902,11 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_CustomHealthCheck_has_typed_con UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_name(envoy_config_core_v3_HealthCheck_CustomHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_typed_config(envoy_config_core_v3_HealthCheck_CustomHealthCheck *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_HealthCheck_CustomHealthCheck_mutable_typed_config(envoy_config_core_v3_HealthCheck_CustomHealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_HealthCheck_CustomHealthCheck_typed_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c index c0071c71f7..5c1b33c1f2 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c @@ -11,6 +11,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "envoy/config/core/v3/event_service_config.upb_minitable.h" #include "envoy/config/core/v3/extension.upb_minitable.h" +#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/v3/http.upb_minitable.h" #include "envoy/type/v3/range.upb_minitable.h" @@ -34,6 +35,9 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = { NULL, &envoy_config_core_v3_HealthStatusSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthStatusSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_ppv4_1bt}, @@ -64,7 +68,7 @@ static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_submsgs[21] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { +static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -72,15 +76,15 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { {5, UPB_SIZE(28, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(32, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(36, 72), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(40, 80), 71, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {14, UPB_SIZE(48, 88), 72, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {15, UPB_SIZE(52, 96), 73, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(56, 104), 74, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {18, UPB_SIZE(60, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {19, UPB_SIZE(64, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(68, 128), 75, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -89,12 +93,16 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { {23, UPB_SIZE(80, 152), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(84, 160), 79, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { &envoy_config_core_v3_HealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck__fields[0], - UPB_SIZE(104, 184), 24, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(112, 184), 25, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -122,7 +130,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x00a800003f1401ca, &upb_prm_2bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001500003f0001d0, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -140,6 +148,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = { NULL, &envoy_config_core_v3_HealthCheck_Payload__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.Payload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -177,6 +188,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0], UPB_SIZE(72, 120), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.HttpHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -197,20 +211,25 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[2] = { +static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[2] = { +static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[3] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init = { &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0], - UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.TcpHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -227,6 +246,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i NULL, &envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.RedisHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -247,6 +269,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.GrpcHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -268,6 +293,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_ &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.CustomHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -284,6 +312,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init = NULL, &envoy_config_core_v3_HealthCheck_TlsOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.TlsOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h index 8bb6560ce1..c3c668f96a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h @@ -117,7 +117,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HttpService_request_headers_to_add_m UPB_INLINE void envoy_config_core_v3_HttpService_set_http_uri(envoy_config_core_v3_HttpService *msg, struct envoy_config_core_v3_HttpUri* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpService_mutable_http_uri(envoy_config_core_v3_HttpService* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_config_core_v3_HttpService_http_uri(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c index 4fec6856e6..90cd14f86c 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = { &envoy_config_core_v3_HttpService_submsgs[0], &envoy_config_core_v3_HttpService__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h index 576785eeb2..06f281871a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h @@ -121,15 +121,15 @@ UPB_INLINE bool envoy_config_core_v3_HttpUri_has_timeout(const envoy_config_core UPB_INLINE void envoy_config_core_v3_HttpUri_set_uri(envoy_config_core_v3_HttpUri *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpUri_set_cluster(envoy_config_core_v3_HttpUri *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpUri_set_timeout(envoy_config_core_v3_HttpUri *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable_timeout(envoy_config_core_v3_HttpUri* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpUri_timeout(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c index 977501414c..9af4b82ff1 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = { &envoy_config_core_v3_HttpUri_submsgs[0], &envoy_config_core_v3_HttpUri__fields[0], UPB_SIZE(40, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpUri", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h index 286a197f38..a64136a0ee 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_config_core_v3_QuicKeepAliveSettings_has_initial_interval( UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_max_interval(envoy_config_core_v3_QuicKeepAliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_max_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_max_interval(msg); @@ -180,7 +180,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSe } UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_initial_interval(envoy_config_core_v3_QuicKeepAliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_initial_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_initial_interval(msg); @@ -308,33 +308,49 @@ UPB_INLINE bool envoy_config_core_v3_QuicProtocolOptions_has_connection_keepaliv return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_connection_options(envoy_config_core_v3_QuicProtocolOptions* msg) { - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_QuicProtocolOptions_connection_options(const envoy_config_core_v3_QuicProtocolOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_client_connection_options(envoy_config_core_v3_QuicProtocolOptions* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_QuicProtocolOptions_client_connection_options(const envoy_config_core_v3_QuicProtocolOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_QuicProtocolOptions_idle_network_timeout(const envoy_config_core_v3_QuicProtocolOptions* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_QuicProtocolOptions_has_idle_network_timeout(const envoy_config_core_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_max_concurrent_streams(msg); @@ -346,7 +362,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_stream_window_size(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_stream_window_size(msg); @@ -358,7 +374,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_connection_window_size(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_connection_window_size(msg); @@ -370,7 +386,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_num_timeouts_to_trigger_port_migration(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_num_timeouts_to_trigger_port_migration(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_num_timeouts_to_trigger_port_migration(msg); @@ -382,7 +398,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_connection_keepalive(envoy_config_core_v3_QuicProtocolOptions *msg, envoy_config_core_v3_QuicKeepAliveSettings* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_QuicProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicKeepAliveSettings* sub = (struct envoy_config_core_v3_QuicKeepAliveSettings*)envoy_config_core_v3_QuicProtocolOptions_connection_keepalive(msg); @@ -393,12 +409,24 @@ UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_ return sub; } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_connection_options(envoy_config_core_v3_QuicProtocolOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_client_connection_options(envoy_config_core_v3_QuicProtocolOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicProtocolOptions_mutable_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicProtocolOptions_idle_network_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_core_v3_QuicProtocolOptions_set_idle_network_timeout(msg, sub); + } + return sub; } /* envoy.config.core.v3.UpstreamHttpProtocolOptions */ @@ -476,15 +504,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_UpstreamHttpProtocolOptions_overr UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_auto_sni(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_auto_san_validation(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_override_auto_sni_header(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.AlternateProtocolsCacheOptions */ @@ -634,11 +662,11 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_AlternateProtocolsCacheOptions_canon UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_name(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_max_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_max_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_AlternateProtocolsCacheOptions_max_entries(msg); @@ -650,7 +678,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_AlternatePro } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_key_value_store_config(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_key_value_store_config(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_AlternateProtocolsCacheOptions_key_value_store_config(msg); @@ -782,11 +810,11 @@ UPB_INLINE uint32_t envoy_config_core_v3_AlternateProtocolsCacheOptions_Alternat UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_set_hostname(envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_set_port(envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HttpProtocolOptions */ @@ -920,7 +948,7 @@ UPB_INLINE bool envoy_config_core_v3_HttpProtocolOptions_has_max_requests_per_co UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_idle_timeout(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_idle_timeout(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_idle_timeout(msg); @@ -932,7 +960,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_headers_count(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_headers_count(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_headers_count(msg); @@ -944,7 +972,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocol } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_connection_duration(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_connection_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_connection_duration(msg); @@ -956,7 +984,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_stream_duration(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_stream_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_stream_duration(msg); @@ -968,11 +996,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_headers_with_underscores_action(envoy_config_core_v3_HttpProtocolOptions *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_requests_per_connection(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_requests_per_connection(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_requests_per_connection(msg); @@ -1158,7 +1186,7 @@ UPB_INLINE bool envoy_config_core_v3_Http1ProtocolOptions_allow_custom_methods(c UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_allow_absolute_url(msg); @@ -1170,15 +1198,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_accept_http_10(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_default_host_for_http_10(envoy_config_core_v3_Http1ProtocolOptions *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_header_key_format(envoy_config_core_v3_Http1ProtocolOptions *msg, envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_config_core_v3_Http1ProtocolOptions_mutable_header_key_format(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)envoy_config_core_v3_Http1ProtocolOptions_header_key_format(msg); @@ -1190,15 +1218,15 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* env } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_enable_trailers(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_chunked_length(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(25, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -1210,11 +1238,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_send_fully_qualified_url(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_use_balsa_parser(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_use_balsa_parser(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_use_balsa_parser(msg); @@ -1226,7 +1254,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_custom_methods(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat */ @@ -1310,7 +1338,7 @@ UPB_INLINE bool envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_has_st UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_proper_case_words(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *msg, envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_proper_case_words(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_proper_case_words(msg); @@ -1322,7 +1350,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_Prop } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_stateful_formatter(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_stateful_formatter(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_stateful_formatter(msg); @@ -1474,7 +1502,7 @@ UPB_INLINE bool envoy_config_core_v3_KeepaliveSettings_has_connection_idle_inter UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_interval(msg); @@ -1486,7 +1514,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettin } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_timeout(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_timeout(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_timeout(msg); @@ -1498,7 +1526,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettin } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval_jitter(envoy_config_core_v3_KeepaliveSettings *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSettings_mutable_interval_jitter(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_KeepaliveSettings_interval_jitter(msg); @@ -1510,7 +1538,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSettings_ } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_connection_idle_interval(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_connection_idle_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_connection_idle_interval(msg); @@ -1820,7 +1848,7 @@ UPB_INLINE bool envoy_config_core_v3_Http2ProtocolOptions_has_use_oghttp2_codec( UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_hpack_table_size(msg); @@ -1832,7 +1860,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_concurrent_streams(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_concurrent_streams(msg); @@ -1844,7 +1872,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_stream_window_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_stream_window_size(msg); @@ -1856,7 +1884,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_connection_window_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_connection_window_size(msg); @@ -1868,15 +1896,15 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_allow_connect(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_allow_metadata(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(29, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_frames(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_frames(msg); @@ -1888,7 +1916,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_control_frames(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_control_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_control_frames(msg); @@ -1900,7 +1928,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_consecutive_inbound_frames_with_empty_payload(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_consecutive_inbound_frames_with_empty_payload(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_consecutive_inbound_frames_with_empty_payload(msg); @@ -1912,7 +1940,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_priority_frames_per_stream(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_priority_frames_per_stream(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_priority_frames_per_stream(msg); @@ -1924,7 +1952,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_window_update_frames_per_data_frame_sent(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_window_update_frames_per_data_frame_sent(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_window_update_frames_per_data_frame_sent(msg); @@ -1936,7 +1964,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_stream_error_on_invalid_http_messaging(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter** envoy_config_core_v3_Http2ProtocolOptions_mutable_custom_settings_parameters(envoy_config_core_v3_Http2ProtocolOptions* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(56, 88), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1970,7 +1998,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* e } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 96), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -1982,7 +2010,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolO } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_connection_keepalive(envoy_config_core_v3_Http2ProtocolOptions *msg, envoy_config_core_v3_KeepaliveSettings* value) { const upb_MiniTableField field = {15, UPB_SIZE(64, 104), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Http2ProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_KeepaliveSettings* sub = (struct envoy_config_core_v3_KeepaliveSettings*)envoy_config_core_v3_Http2ProtocolOptions_connection_keepalive(msg); @@ -1994,7 +2022,7 @@ UPB_INLINE struct envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_H } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_use_oghttp2_codec(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {16, UPB_SIZE(68, 112), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_use_oghttp2_codec(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_use_oghttp2_codec(msg); @@ -2076,7 +2104,7 @@ UPB_INLINE bool envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_has_ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_identifier(msg); @@ -2088,7 +2116,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_value(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_value(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_value(msg); @@ -2154,7 +2182,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcProtocolOptions_has_http2_protocol_opti UPB_INLINE void envoy_config_core_v3_GrpcProtocolOptions_set_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions *msg, envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_GrpcProtocolOptions_mutable_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_core_v3_GrpcProtocolOptions_http2_protocol_options(msg); @@ -2245,10 +2273,22 @@ UPB_INLINE bool envoy_config_core_v3_Http3ProtocolOptions_allow_extended_connect &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_clear_allow_metadata(envoy_config_core_v3_Http3ProtocolOptions* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_Http3ProtocolOptions_allow_metadata(const envoy_config_core_v3_Http3ProtocolOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions *msg, envoy_config_core_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_Http3ProtocolOptions_mutable_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_core_v3_Http3ProtocolOptions_quic_protocol_options(msg); @@ -2260,7 +2300,7 @@ UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3 } UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http3ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http3ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http3ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -2272,7 +2312,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http3ProtocolO } UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_allow_extended_connect(envoy_config_core_v3_Http3ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_allow_metadata(envoy_config_core_v3_Http3ProtocolOptions *msg, bool value) { + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SchemeHeaderTransformation */ @@ -2316,30 +2360,46 @@ typedef enum { envoy_config_core_v3_SchemeHeaderTransformation_transformation_NOT_SET = 0 } envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases; UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases envoy_config_core_v3_SchemeHeaderTransformation_transformation_case(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_clear_scheme_to_overwrite(envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_SchemeHeaderTransformation_scheme_to_overwrite(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_SchemeHeaderTransformation_has_scheme_to_overwrite(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_clear_match_upstream(envoy_config_core_v3_SchemeHeaderTransformation* msg) { + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_SchemeHeaderTransformation_match_upstream(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_scheme_to_overwrite(envoy_config_core_v3_SchemeHeaderTransformation *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_match_upstream(envoy_config_core_v3_SchemeHeaderTransformation *msg, bool value) { + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c index 8e2d6cdd35..2ddb41826e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TcpProtocolOptions", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = { @@ -41,30 +44,38 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = { &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0], &envoy_config_core_v3_QuicKeepAliveSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QuicKeepAliveSettings", +#endif }; -static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[5] = { +static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[7] = { +static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[8] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = { &envoy_config_core_v3_QuicProtocolOptions_submsgs[0], &envoy_config_core_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QuicProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -87,6 +98,9 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini NULL, &envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.UpstreamHttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -113,6 +127,9 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_ &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0], &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AlternateProtocolsCacheOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -134,6 +151,9 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt NULL, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AlternateProtocolsCacheOptions.AlternateProtocolsCacheEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -163,6 +183,9 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = { &envoy_config_core_v3_HttpProtocolOptions_submsgs[0], &envoy_config_core_v3_HttpProtocolOptions__fields[0], UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -199,6 +222,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = { &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions__fields[0], UPB_SIZE(56, 64), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -233,6 +259,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -257,6 +286,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat.ProperCaseWords", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_KeepaliveSettings_submsgs[4] = { @@ -277,6 +309,9 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = { &envoy_config_core_v3_KeepaliveSettings_submsgs[0], &envoy_config_core_v3_KeepaliveSettings__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeepaliveSettings", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = { @@ -318,6 +353,9 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = { &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions__fields[0], UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http2ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -352,6 +390,9 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http2ProtocolOptions.SettingsParameter", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { @@ -366,6 +407,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = { &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0], &envoy_config_core_v3_GrpcProtocolOptions__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcProtocolOptions", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { @@ -373,16 +417,20 @@ static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[ {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[3] = { +static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[4] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http3ProtocolOptions__fields[0], - UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http3ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -390,22 +438,28 @@ const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000028, &upb_psb1_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000a00003f000030, &upb_psb1_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; -static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[1] = { - {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[2] = { + {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init = { NULL, &envoy_config_core_v3_SchemeHeaderTransformation__fields[0], - UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, + UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SchemeHeaderTransformation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, + {0x000c00003f000010, &upb_psb1_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h index 1b5a53e125..2fb901534f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h @@ -120,7 +120,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_tlv_typ UPB_INLINE void envoy_config_core_v3_ProxyProtocolPassThroughTLVs_set_match_type(envoy_config_core_v3_ProxyProtocolPassThroughTLVs *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_mutable_tlv_type(envoy_config_core_v3_ProxyProtocolPassThroughTLVs* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -218,11 +218,11 @@ UPB_INLINE bool envoy_config_core_v3_ProxyProtocolConfig_has_pass_through_tlvs(c UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_version(envoy_config_core_v3_ProxyProtocolConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_pass_through_tlvs(envoy_config_core_v3_ProxyProtocolConfig *msg, envoy_config_core_v3_ProxyProtocolPassThroughTLVs* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_v3_ProxyProtocolConfig_mutable_pass_through_tlvs(envoy_config_core_v3_ProxyProtocolConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* sub = (struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)envoy_config_core_v3_ProxyProtocolConfig_pass_through_tlvs(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c index 64ace5d894..cb90609336 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in NULL, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ProxyProtocolPassThroughTLVs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -44,6 +47,9 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = { &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0], &envoy_config_core_v3_ProxyProtocolConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ProxyProtocolConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h index 4ebb9716f6..db6fc0bcc4 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h @@ -92,11 +92,11 @@ UPB_INLINE bool envoy_config_core_v3_DnsResolverOptions_no_default_search_domain UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_set_use_tcp_for_dns_lookups(envoy_config_core_v3_DnsResolverOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_set_no_default_search_domain(envoy_config_core_v3_DnsResolverOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.DnsResolutionConfig */ @@ -216,7 +216,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_DnsResoluti } UPB_INLINE void envoy_config_core_v3_DnsResolutionConfig_set_dns_resolver_options(envoy_config_core_v3_DnsResolutionConfig *msg, envoy_config_core_v3_DnsResolverOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsResolutionConfig_mutable_dns_resolver_options(envoy_config_core_v3_DnsResolutionConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolverOptions* sub = (struct envoy_config_core_v3_DnsResolverOptions*)envoy_config_core_v3_DnsResolutionConfig_dns_resolver_options(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c index a960760b05..d40f74c544 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = { NULL, &envoy_config_core_v3_DnsResolverOptions__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DnsResolverOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = { &envoy_config_core_v3_DnsResolutionConfig_submsgs[0], &envoy_config_core_v3_DnsResolutionConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DnsResolutionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h index deb73f6899..36fea88752 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h @@ -163,27 +163,27 @@ UPB_INLINE int32_t envoy_config_core_v3_SocketOption_state(const envoy_config_co UPB_INLINE void envoy_config_core_v3_SocketOption_set_description(envoy_config_core_v3_SocketOption *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_level(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_name(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_int_value(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 16), -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_buf_value(envoy_config_core_v3_SocketOption *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_state(envoy_config_core_v3_SocketOption *msg, int32_t value) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SocketOptionsOverride */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c index 01215ec7ca..7217e7d8ef 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = { NULL, &envoy_config_core_v3_SocketOption__fields[0], UPB_SIZE(48, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = { &envoy_config_core_v3_SocketOptionsOverride_submsgs[0], &envoy_config_core_v3_SocketOptionsOverride__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketOptionsOverride", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h index d9e40b4694..0b20dfa98f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h @@ -85,7 +85,7 @@ UPB_INLINE bool envoy_config_core_v3_JsonFormatOptions_sort_properties(const env UPB_INLINE void envoy_config_core_v3_JsonFormatOptions_set_sort_properties(envoy_config_core_v3_JsonFormatOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SubstitutionFormatString */ @@ -258,11 +258,11 @@ UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_json_format_op UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format(envoy_config_core_v3_SubstitutionFormatString *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format(envoy_config_core_v3_SubstitutionFormatString *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionFormatString_mutable_json_format(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_SubstitutionFormatString_json_format(msg); @@ -274,15 +274,15 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionForma } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_omit_empty_values(envoy_config_core_v3_SubstitutionFormatString *msg, bool value) { const upb_MiniTableField field = {3, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_content_type(envoy_config_core_v3_SubstitutionFormatString *msg, upb_StringView value) { const upb_MiniTableField field = {4, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format_source(envoy_config_core_v3_SubstitutionFormatString *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 16), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_SubstitutionFormatString_mutable_text_format_source(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_SubstitutionFormatString_text_format_source(msg); @@ -324,7 +324,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format_options(envoy_config_core_v3_SubstitutionFormatString *msg, envoy_config_core_v3_JsonFormatOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 56), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_SubstitutionFormatString_mutable_json_format_options(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) { struct envoy_config_core_v3_JsonFormatOptions* sub = (struct envoy_config_core_v3_JsonFormatOptions*)envoy_config_core_v3_SubstitutionFormatString_json_format_options(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c index 42374e39d6..b8d3b0e305 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = { NULL, &envoy_config_core_v3_JsonFormatOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.JsonFormatOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -53,6 +56,9 @@ const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = &envoy_config_core_v3_SubstitutionFormatString_submsgs[0], &envoy_config_core_v3_SubstitutionFormatString__fields[0], UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SubstitutionFormatString", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h index 4afd2a44df..5e6e5f45f1 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h @@ -100,7 +100,7 @@ UPB_INLINE bool envoy_config_core_v3_UdpSocketConfig_has_prefer_gro(const envoy_ UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSocketConfig_mutable_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_UdpSocketConfig_max_rx_datagram_size(msg); @@ -112,7 +112,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSocketCon } UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_prefer_gro(envoy_config_core_v3_UdpSocketConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfig_mutable_prefer_gro(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_UdpSocketConfig_prefer_gro(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c index 22de3eb53d..43067151f9 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = { &envoy_config_core_v3_UdpSocketConfig_submsgs[0], &envoy_config_core_v3_UdpSocketConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.UdpSocketConfig", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h index 713d49b6c4..9a1c5025ed 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h @@ -167,7 +167,7 @@ UPB_INLINE upb_Map* _envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoi UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_cluster_name(envoy_config_endpoint_v3_ClusterLoadAssignment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints** envoy_config_endpoint_v3_ClusterLoadAssignment_mutable_endpoints(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -201,7 +201,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_end } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_policy(envoy_config_endpoint_v3_ClusterLoadAssignment *msg, envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_endpoint_v3_ClusterLoadAssignment_mutable_policy(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)envoy_config_endpoint_v3_ClusterLoadAssignment_policy(msg); @@ -382,7 +382,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOver } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_overprovisioning_factor(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_overprovisioning_factor(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_overprovisioning_factor(msg); @@ -394,7 +394,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_ClusterL } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_endpoint_stale_after(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_endpoint_stale_after(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_endpoint_stale_after(msg); @@ -406,7 +406,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoad } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_weighted_priority_health(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload */ @@ -476,11 +476,11 @@ UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverlo UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_set_category(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_set_drop_percentage(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_mutable_drop_percentage(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_drop_percentage(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c index c4414526bf..1d55450ee8 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -86,6 +92,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__ &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +114,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEnd &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.NamedEndpointsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h index 27cd1c9800..55c49b4cba 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h @@ -158,7 +158,7 @@ UPB_INLINE upb_Array* _envoy_config_endpoint_v3_Endpoint_additional_addresses_mu UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_address(envoy_config_endpoint_v3_Endpoint *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_mutable_address(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_address(msg); @@ -170,7 +170,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoin } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_health_check_config(envoy_config_endpoint_v3_Endpoint *msg, envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_endpoint_v3_Endpoint_mutable_health_check_config(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* sub = (struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)envoy_config_endpoint_v3_Endpoint_health_check_config(msg); @@ -182,7 +182,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_con } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_hostname(envoy_config_endpoint_v3_Endpoint *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress** envoy_config_endpoint_v3_Endpoint_mutable_additional_addresses(envoy_config_endpoint_v3_Endpoint* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -306,15 +306,15 @@ UPB_INLINE bool envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_disable_acti UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_port_value(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_hostname(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_address(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_mutable_address(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_address(msg); @@ -326,7 +326,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoin } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_disable_active_health_check(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.Endpoint.AdditionalAddress */ @@ -384,7 +384,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_Endpoint_AdditionalAddress_has_address( UPB_INLINE void envoy_config_endpoint_v3_Endpoint_AdditionalAddress_set_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_mutable_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_AdditionalAddress_address(msg); @@ -520,7 +520,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_LbEndpoint_has_endpoint_name(const envo UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint(envoy_config_endpoint_v3_LbEndpoint *msg, envoy_config_endpoint_v3_Endpoint* value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), UPB_SIZE(-25, -17), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_LbEndpoint_mutable_endpoint(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_Endpoint* sub = (struct envoy_config_endpoint_v3_Endpoint*)envoy_config_endpoint_v3_LbEndpoint_endpoint(msg); @@ -532,11 +532,11 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Lb } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_health_status(envoy_config_endpoint_v3_LbEndpoint *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_metadata(envoy_config_endpoint_v3_LbEndpoint *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LbEndpoint_mutable_metadata(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_endpoint_v3_LbEndpoint_metadata(msg); @@ -548,7 +548,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LbEndp } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_load_balancing_weight(envoy_config_endpoint_v3_LbEndpoint *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LbEndpoint_mutable_load_balancing_weight(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LbEndpoint_load_balancing_weight(msg); @@ -560,7 +560,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LbEndpoi } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint_name(envoy_config_endpoint_v3_LbEndpoint *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 24), UPB_SIZE(-25, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.LedsClusterLocalityConfig */ @@ -630,7 +630,7 @@ UPB_INLINE upb_StringView envoy_config_endpoint_v3_LedsClusterLocalityConfig_led UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint_v3_LedsClusterLocalityConfig_mutable_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_endpoint_v3_LedsClusterLocalityConfig_leds_config(msg); @@ -642,7 +642,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint_v3_Le } UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_collection_name(envoy_config_endpoint_v3_LedsClusterLocalityConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.LocalityLbEndpoints */ @@ -687,7 +687,7 @@ typedef enum { envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_NOT_SET = 0 } envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases; UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_case(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -784,41 +784,57 @@ UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_proximity(const return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancer_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* default_val = NULL; const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* ret; - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_load_balancer_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LocalityLbEndpoints_leds_cluster_locality_config(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { const envoy_config_endpoint_v3_LedsClusterLocalityConfig* default_val = NULL; const envoy_config_endpoint_v3_LedsClusterLocalityConfig* ret; - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_leds_cluster_locality_config(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LocalityLbEndpoints_metadata(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const struct envoy_config_core_v3_Metadata* default_val = NULL; + const struct envoy_config_core_v3_Metadata* ret; + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_metadata(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_locality(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_locality(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_LocalityLbEndpoints_locality(msg); @@ -860,7 +876,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_ } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancing_weight(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancing_weight(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancing_weight(msg); @@ -872,11 +888,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Locality } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_priority(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_proximity(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_proximity(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_proximity(msg); @@ -887,8 +903,8 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Locality return sub; } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* value) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancer_endpoints(msg); @@ -899,8 +915,8 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* e return sub; } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, envoy_config_endpoint_v3_LedsClusterLocalityConfig* value) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* sub = (struct envoy_config_endpoint_v3_LedsClusterLocalityConfig*)envoy_config_endpoint_v3_LocalityLbEndpoints_leds_cluster_locality_config(msg); @@ -910,6 +926,18 @@ UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_conf } return sub; } +UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct envoy_config_core_v3_Metadata* value) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { + struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_endpoint_v3_LocalityLbEndpoints_metadata(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena); + if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_metadata(msg, sub); + } + return sub; +} /* envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c index 5e9c00749b..0a794b1418 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = { &envoy_config_endpoint_v3_Endpoint_submsgs[0], &envoy_config_endpoint_v3_Endpoint__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -64,6 +67,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0], &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint.HealthCheckConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -88,6 +94,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0], &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint.AdditionalAddress", +#endif }; static const upb_MiniTableSub envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { @@ -108,6 +117,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = { &envoy_config_endpoint_v3_LbEndpoint_submsgs[0], &envoy_config_endpoint_v3_LbEndpoint__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LbEndpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800100100000a, &upb_pom_1bt_max64b}, @@ -133,6 +145,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0], &envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LedsClusterLocalityConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -141,29 +156,34 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[6] = { +static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, }; -static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[7] = { +static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[8] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(28, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = { &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0], - UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LocalityLbEndpoints", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -172,8 +192,8 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000028, &upb_psv4_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x003800100704003a, &upb_pom_1bt_max64b}, - {0x0038001008050042, &upb_pom_1bt_max64b}, + {0x004000100704003a, &upb_pom_1bt_max64b}, + {0x0040001008050042, &upb_pom_1bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -196,6 +216,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpoint &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h index 303fda0ad5..75d43e45e8 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h @@ -16,6 +16,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/struct.upb_minitable.h" +#include "xds/annotations/v3/status.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -30,6 +31,7 @@ extern "C" { typedef struct envoy_config_endpoint_v3_UpstreamLocalityStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UpstreamLocalityStats; typedef struct envoy_config_endpoint_v3_UpstreamEndpointStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UpstreamEndpointStats; typedef struct envoy_config_endpoint_v3_EndpointLoadMetricStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_EndpointLoadMetricStats; +typedef struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats; typedef struct envoy_config_endpoint_v3_ClusterStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_ClusterStats; typedef struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_ClusterStats_DroppedRequests; struct envoy_config_core_v3_Address; @@ -92,37 +94,37 @@ UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_locality(cons return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_successful_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_successful_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_requests_in_progress(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_error_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_error_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -204,21 +206,105 @@ UPB_INLINE upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_upstream_e return arr; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_issued_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_issued_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_active_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_active_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_new_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_new_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_fail_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_fail_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_cpu_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_cpu_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mem_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_mem_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_application_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_application_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_locality(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_UpstreamLocalityStats_locality(msg); @@ -229,16 +315,16 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_Upstre return sub; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_successful_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_error_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_load_metric_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -272,7 +358,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_priority(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats** envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_upstream_endpoint_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(24, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -305,8 +391,56 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_e return sub; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_active_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_new_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_fail_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_cpu_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_cpu_utilization(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_mem_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_mem_utilization(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_application_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_application_utilization(msg, sub); + } + return sub; } /* envoy.config.endpoint.v3.UpstreamEndpointStats */ @@ -460,7 +594,7 @@ UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamEndpointStats_total_issued_ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_address(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_address(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_UpstreamEndpointStats_address(msg); @@ -472,15 +606,15 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Upstrea } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_successful_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_error_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {4, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_load_metric_stats(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -514,7 +648,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_metadata(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_metadata(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_endpoint_v3_UpstreamEndpointStats_metadata(msg); @@ -526,7 +660,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_endpoint_v3_UpstreamEndpo } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_issued_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.EndpointLoadMetricStats */ @@ -604,15 +738,85 @@ UPB_INLINE double envoy_config_endpoint_v3_EndpointLoadMetricStats_total_metric_ UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_metric_name(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_num_requests_finished_with_metric(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_total_metric_value(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, double value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats */ + +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(upb_Arena* arena) { + return (envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); +} +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret = envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret = envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_serialize(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_serialize_ex(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_clear_num_requests_finished_with_metric(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_num_requests_finished_with_metric(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_clear_total_metric_value(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE double envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_total_metric_value(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + double default_val = 0; + double ret; + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_num_requests_finished_with_metric(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats *msg, uint64_t value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_total_metric_value(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats *msg, double value) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterStats */ @@ -770,7 +974,7 @@ UPB_INLINE upb_StringView envoy_config_endpoint_v3_ClusterStats_cluster_service_ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_name(envoy_config_endpoint_v3_ClusterStats *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats** envoy_config_endpoint_v3_ClusterStats_mutable_upstream_locality_stats(envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -804,11 +1008,11 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_e } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_total_dropped_requests(envoy_config_endpoint_v3_ClusterStats *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_load_report_interval(envoy_config_endpoint_v3_ClusterStats *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterStats_mutable_load_report_interval(envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterStats_load_report_interval(msg); @@ -850,7 +1054,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_c } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_service_name(envoy_config_endpoint_v3_ClusterStats *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterStats.DroppedRequests */ @@ -916,11 +1120,11 @@ UPB_INLINE uint64_t envoy_config_endpoint_v3_ClusterStats_DroppedRequests_droppe UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_category(envoy_config_endpoint_v3_ClusterStats_DroppedRequests *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_dropped_count(envoy_config_endpoint_v3_ClusterStats_DroppedRequests *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c index a6a67f9e92..366f1fd678 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c @@ -12,6 +12,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/struct.upb_minitable.h" +#include "xds/annotations/v3/status.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -19,27 +20,39 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[3] = { +static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, }; -static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[8] = { +static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[14] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(24, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = { &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0], - UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(96, 120), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UpstreamLocalityStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -50,9 +63,9 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init {0x000c00003f000030, &upb_psv4_1bt}, {0x003800003f02003a, &upb_prm_1bt_max128b}, {0x004000003f000040, &upb_psv8_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x004800003f000048, &upb_psv8_1bt}, + {0x005000003f000050, &upb_psv8_1bt}, + {0x005800003f000058, &upb_psv8_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -80,6 +93,9 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0], UPB_SIZE(56, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UpstreamEndpointStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -102,6 +118,9 @@ const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_ini NULL, &envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.EndpointLoadMetricStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -110,6 +129,26 @@ const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_ini }) }; +static const upb_MiniTableField envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats__fields[2] = { + {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init = { + NULL, + &envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f000008, &upb_psv8_1bt}, + {0x001000003f000011, &upb_psf8_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterStats_submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -129,6 +168,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = { &envoy_config_endpoint_v3_ClusterStats_submsgs[0], &envoy_config_endpoint_v3_ClusterStats__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -150,6 +192,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_m NULL, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterStats.DroppedRequests", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -158,10 +203,11 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_m }) }; -static const upb_MiniTable *messages_layout[5] = { +static const upb_MiniTable *messages_layout[6] = { &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, + &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, &envoy__config__endpoint__v3__ClusterStats_msg_init, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, }; @@ -170,7 +216,7 @@ const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layo messages_layout, NULL, NULL, - 5, + 6, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h index 2bfb250c74..001a307d7a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h @@ -20,6 +20,7 @@ extern "C" { extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init; +extern const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h index 36d1497a82..10d2aca4ea 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_config_listener_v3_ApiListener_has_api_listener(const envo UPB_INLINE void envoy_config_listener_v3_ApiListener_set_api_listener(envoy_config_listener_v3_ApiListener *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_mutable_api_listener(envoy_config_listener_v3_ApiListener* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ApiListener_api_listener(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c index c72fc8449a..f3b9f37f3a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = { &envoy_config_listener_v3_ApiListener_submsgs[0], &envoy_config_listener_v3_ApiListener__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ApiListener", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h index 2f0afb8016..be164b4890 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h @@ -142,7 +142,7 @@ UPB_INLINE bool envoy_config_listener_v3_AdditionalAddress_has_socket_options(co UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_address(envoy_config_listener_v3_AdditionalAddress *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_AdditionalAddress_mutable_address(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_AdditionalAddress_address(msg); @@ -154,7 +154,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Additio } UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_socket_options(envoy_config_listener_v3_AdditionalAddress *msg, struct envoy_config_core_v3_SocketOptionsOverride* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_listener_v3_AdditionalAddress_mutable_socket_options(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_listener_v3_AdditionalAddress_socket_options(msg); @@ -306,18 +306,18 @@ typedef enum { envoy_config_listener_v3_Listener_listener_specifier_NOT_SET = 0 } envoy_config_listener_v3_Listener_listener_specifier_oneofcases; UPB_INLINE envoy_config_listener_v3_Listener_listener_specifier_oneofcases envoy_config_listener_v3_Listener_listener_specifier_case(const envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_listener_v3_Listener_listener_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_name(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_listener_v3_Listener_name(const envoy_config_listener_v3_Listener* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -739,29 +739,29 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_has_bind_to_port(const envoy_c return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_internal_listener(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_internal_listener(const envoy_config_listener_v3_Listener* msg) { const envoy_config_listener_v3_Listener_InternalListenerConfig* default_val = NULL; const envoy_config_listener_v3_Listener_InternalListenerConfig* ret; - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_listener_v3_Listener_has_internal_listener(const envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_stat_prefix(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_listener_v3_Listener_stat_prefix(const envoy_config_listener_v3_Listener* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -870,14 +870,26 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_has_max_connections_to_accept_ const upb_MiniTableField field = {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_listener_v3_Listener_clear_bypass_overload_manager(envoy_config_listener_v3_Listener* msg) { + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_listener_v3_Listener_bypass_overload_manager(const envoy_config_listener_v3_Listener* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_listener_v3_Listener_set_name(envoy_config_listener_v3_Listener *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_address(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listener_mutable_address(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_Listener_address(msg); @@ -919,7 +931,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_Listener_set_use_original_dst(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_use_original_dst(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_use_original_dst(msg); @@ -931,7 +943,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 72), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_per_connection_buffer_limit_bytes(msg); @@ -943,7 +955,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } UPB_INLINE void envoy_config_listener_v3_Listener_set_metadata(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 80), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listener_mutable_metadata(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_Listener_metadata(msg); @@ -955,7 +967,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listen } UPB_INLINE void envoy_config_listener_v3_Listener_set_deprecated_v1(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_DeprecatedV1* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 88), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_mutable_deprecated_v1(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_DeprecatedV1* sub = (struct envoy_config_listener_v3_Listener_DeprecatedV1*)envoy_config_listener_v3_Listener_deprecated_v1(msg); @@ -967,7 +979,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_l } UPB_INLINE void envoy_config_listener_v3_Listener_set_drain_type(envoy_config_listener_v3_Listener *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilter** envoy_config_listener_v3_Listener_mutable_listener_filters(envoy_config_listener_v3_Listener* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1001,7 +1013,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilter* envoy_config_listener } UPB_INLINE void envoy_config_listener_v3_Listener_set_transparent(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 104), 69, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_transparent(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_transparent(msg); @@ -1013,7 +1025,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_freebind(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 112), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_freebind(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_freebind(msg); @@ -1025,7 +1037,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_fast_open_queue_length(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 120), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_fast_open_queue_length(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_fast_open_queue_length(msg); @@ -1067,7 +1079,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_listener_v3_Li } UPB_INLINE void envoy_config_listener_v3_Listener_set_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {15, UPB_SIZE(60, 136), 72, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_Listener_mutable_listener_filters_timeout(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_Listener_listener_filters_timeout(msg); @@ -1079,15 +1091,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_Listener_mu } UPB_INLINE void envoy_config_listener_v3_Listener_set_traffic_direction(envoy_config_listener_v3_Listener *msg, int32_t value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_continue_on_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_udp_listener_config(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_UdpListenerConfig* value) { const upb_MiniTableField field = {18, UPB_SIZE(72, 144), 73, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_Listener_mutable_udp_listener_config(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_UdpListenerConfig* sub = (struct envoy_config_listener_v3_UdpListenerConfig*)envoy_config_listener_v3_Listener_udp_listener_config(msg); @@ -1099,7 +1111,7 @@ UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_liste } UPB_INLINE void envoy_config_listener_v3_Listener_set_api_listener(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_ApiListener* value) { const upb_MiniTableField field = {19, UPB_SIZE(76, 152), 74, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_Listener_mutable_api_listener(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ApiListener* sub = (struct envoy_config_listener_v3_ApiListener*)envoy_config_listener_v3_Listener_api_listener(msg); @@ -1111,7 +1123,7 @@ UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_Listener_set_connection_balance_config(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_ConnectionBalanceConfig* value) { const upb_MiniTableField field = {20, UPB_SIZE(80, 160), 75, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_mutable_connection_balance_config(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)envoy_config_listener_v3_Listener_connection_balance_config(msg); @@ -1123,7 +1135,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* env } UPB_INLINE void envoy_config_listener_v3_Listener_set_reuse_port(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(84, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_listener_v3_Listener_mutable_access_log(envoy_config_listener_v3_Listener* msg, size_t* size) { upb_MiniTableField field = {22, UPB_SIZE(88, 168), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1157,7 +1169,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_listener_v3_ } UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_backlog_size(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {24, UPB_SIZE(92, 176), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_backlog_size(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_backlog_size(msg); @@ -1169,7 +1181,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } UPB_INLINE void envoy_config_listener_v3_Listener_set_default_filter_chain(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_FilterChain* value) { const upb_MiniTableField field = {25, UPB_SIZE(96, 184), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_mutable_default_filter_chain(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)envoy_config_listener_v3_Listener_default_filter_chain(msg); @@ -1181,7 +1193,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_Listener_set_bind_to_port(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {26, UPB_SIZE(100, 192), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_bind_to_port(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_bind_to_port(msg); @@ -1192,8 +1204,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_internal_listener(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_InternalListenerConfig* value) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_mutable_internal_listener(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_InternalListenerConfig* sub = (struct envoy_config_listener_v3_Listener_InternalListenerConfig*)envoy_config_listener_v3_Listener_internal_listener(msg); @@ -1204,12 +1216,12 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_InternalListenerConfig* envo return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_stat_prefix(envoy_config_listener_v3_Listener *msg, upb_StringView value) { - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_enable_reuse_port(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {29, UPB_SIZE(108, 216), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_enable_reuse_port(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_enable_reuse_port(msg); @@ -1221,15 +1233,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_enable_mptcp(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {30, UPB_SIZE(112, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_ignore_global_conn_limit(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(113, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_filter_chain_matcher(envoy_config_listener_v3_Listener *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {32, UPB_SIZE(116, 224), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_listener_v3_Listener_mutable_filter_chain_matcher(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_listener_v3_Listener_filter_chain_matcher(msg); @@ -1271,7 +1283,7 @@ UPB_INLINE struct envoy_config_listener_v3_AdditionalAddress* envoy_config_liste } UPB_INLINE void envoy_config_listener_v3_Listener_set_max_connections_to_accept_per_socket_event(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_max_connections_to_accept_per_socket_event(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_max_connections_to_accept_per_socket_event(msg); @@ -1281,6 +1293,10 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } return sub; } +UPB_INLINE void envoy_config_listener_v3_Listener_set_bypass_overload_manager(envoy_config_listener_v3_Listener *msg, bool value) { + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.listener.v3.Listener.DeprecatedV1 */ @@ -1337,7 +1353,7 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_DeprecatedV1_has_bind_to_port( UPB_INLINE void envoy_config_listener_v3_Listener_DeprecatedV1_set_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1 *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_DeprecatedV1_mutable_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_DeprecatedV1_bind_to_port(msg); @@ -1429,7 +1445,7 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_ConnectionBalanceConfig_has_ex UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_exact_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig *msg, envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_exact_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_exact_balance(msg); @@ -1441,7 +1457,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_Exac } UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_extend_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_extend_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_extend_balance(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c index 6744776bf4..36541d5abc 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c @@ -44,6 +44,9 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = { &envoy_config_listener_v3_AdditionalAddress_submsgs[0], &envoy_config_listener_v3_AdditionalAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.AdditionalAddress", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_ListenerCollection_submsgs[1] = { @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = { &envoy_config_listener_v3_ListenerCollection_submsgs[0], &envoy_config_listener_v3_ListenerCollection__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerCollection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -91,8 +97,8 @@ static const upb_MiniTableSub envoy_config_listener_v3_Listener_submsgs[24] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, }; -static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = { - {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] = { + {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -116,20 +122,24 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = {24, UPB_SIZE(92, 176), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(96, 184), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(100, 192), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(108, 216), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(112, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(113, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(116, 224), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { &envoy_config_listener_v3_Listener_submsgs[0], &envoy_config_listener_v3_Listener__fields[0], - UPB_SIZE(152, 256), 32, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(152, 256), 33, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -150,7 +160,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { {0x001000003f000180, &upb_psv4_2bt}, {0x001400003f000188, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001e00003f000298, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001500003f0001a8, &upb_psb1_2bt}, {0x00a800003f0f01b2, &upb_prm_2bt_maxmaxb}, @@ -178,6 +188,9 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0], &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.DeprecatedV1", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = { @@ -194,6 +207,9 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0], &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.ConnectionBalanceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -206,30 +222,45 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.ConnectionBalanceConfig.ExactBalance", +#endif }; const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.InternalListenerConfig", +#endif }; const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerManager", +#endif }; const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ValidationListenerManager", +#endif }; const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ApiListenerManager", +#endif }; static const upb_MiniTable *messages_layout[10] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h index 10c78c793d..5c0bcc3e11 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h @@ -149,11 +149,11 @@ UPB_INLINE bool envoy_config_listener_v3_Filter_has_config_discovery(const envoy UPB_INLINE void envoy_config_listener_v3_Filter_set_name(envoy_config_listener_v3_Filter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Filter_set_typed_config(envoy_config_listener_v3_Filter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_typed_config(envoy_config_listener_v3_Filter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_Filter_typed_config(msg); @@ -165,7 +165,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_t } UPB_INLINE void envoy_config_listener_v3_Filter_set_config_discovery(envoy_config_listener_v3_Filter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_Filter_mutable_config_discovery(envoy_config_listener_v3_Filter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_Filter_config_discovery(msg); @@ -505,11 +505,11 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_address_suffix(envoy_config_listener_v3_FilterChainMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_suffix_len(envoy_config_listener_v3_FilterChainMatch *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_suffix_len(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_suffix_len(msg); @@ -579,7 +579,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChainMatch_add_source_ports(envoy } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_destination_port(envoy_config_listener_v3_FilterChainMatch *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 64), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_destination_port(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_destination_port(msg); @@ -591,7 +591,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterCh } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_transport_protocol(envoy_config_listener_v3_FilterChainMatch *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_listener_v3_FilterChainMatch_mutable_application_protocols(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(32, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -651,7 +651,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChainMatch_add_server_names(envoy } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_source_type(envoy_config_listener_v3_FilterChainMatch *msg, int32_t value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_FilterChainMatch_mutable_direct_source_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(44, 104), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -863,7 +863,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_transport_socket_connec UPB_INLINE void envoy_config_listener_v3_FilterChain_set_filter_chain_match(envoy_config_listener_v3_FilterChain *msg, envoy_config_listener_v3_FilterChainMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChain_mutable_filter_chain_match(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_listener_v3_FilterChainMatch* sub = (struct envoy_config_listener_v3_FilterChainMatch*)envoy_config_listener_v3_FilterChain_filter_chain_match(msg); @@ -905,7 +905,7 @@ UPB_INLINE struct envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filt } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_use_proxy_proto(envoy_config_listener_v3_FilterChain *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChain_mutable_use_proxy_proto(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_FilterChain_use_proxy_proto(msg); @@ -917,7 +917,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChai } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_metadata(envoy_config_listener_v3_FilterChain *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_FilterChain_mutable_metadata(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_FilterChain_metadata(msg); @@ -929,7 +929,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Filter } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket(envoy_config_listener_v3_FilterChain *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_listener_v3_FilterChain_mutable_transport_socket(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_listener_v3_FilterChain_transport_socket(msg); @@ -941,11 +941,11 @@ UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_name(envoy_config_listener_v3_FilterChain *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_on_demand_configuration(envoy_config_listener_v3_FilterChain *msg, envoy_config_listener_v3_FilterChain_OnDemandConfiguration* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 72), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_mutable_on_demand_configuration(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* sub = (struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)envoy_config_listener_v3_FilterChain_on_demand_configuration(msg); @@ -957,7 +957,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* en } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 80), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_mutable_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_transport_socket_connect_timeout(msg); @@ -1023,7 +1023,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChain_OnDemandConfiguration_has_r UPB_INLINE void envoy_config_listener_v3_FilterChain_OnDemandConfiguration_set_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_mutable_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_OnDemandConfiguration_rebuild_timeout(msg); @@ -1166,7 +1166,7 @@ UPB_INLINE bool envoy_config_listener_v3_ListenerFilterChainMatchPredicate_has_d UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_or_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_or_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_or_match(msg); @@ -1178,7 +1178,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Mat } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_and_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_and_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_and_match(msg); @@ -1190,7 +1190,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Mat } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_not_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_not_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_not_match(msg); @@ -1202,11 +1202,11 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_any_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_destination_port_range(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, struct envoy_type_v3_Int32Range* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_destination_port_range(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_destination_port_range(msg); @@ -1426,11 +1426,11 @@ UPB_INLINE bool envoy_config_listener_v3_ListenerFilter_has_config_discovery(con UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_name(envoy_config_listener_v3_ListenerFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_typed_config(envoy_config_listener_v3_ListenerFilter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ListenerFilter_mutable_typed_config(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ListenerFilter_typed_config(msg); @@ -1442,7 +1442,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ListenerFilter_m } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_filter_disabled(envoy_config_listener_v3_ListenerFilter *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilter_mutable_filter_disabled(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilter_filter_disabled(msg); @@ -1454,7 +1454,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_config_discovery(envoy_config_listener_v3_ListenerFilter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_ListenerFilter_mutable_config_discovery(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_ListenerFilter_config_discovery(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c index 2c8c505c98..238cddc7d7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c @@ -38,6 +38,9 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = { &envoy_config_listener_v3_Filter_submsgs[0], &envoy_config_listener_v3_Filter__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Filter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -76,6 +79,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = { &envoy_config_listener_v3_FilterChainMatch_submsgs[0], &envoy_config_listener_v3_FilterChainMatch__fields[0], UPB_SIZE(64, 112), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChainMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -121,6 +127,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = { &envoy_config_listener_v3_FilterChain_submsgs[0], &envoy_config_listener_v3_FilterChain__fields[0], UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChain", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -145,6 +154,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0], &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChain.OnDemandConfiguration", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = { @@ -166,6 +178,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0], UPB_SIZE(16, 24), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilterChainMatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -190,6 +205,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilterChainMatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -213,6 +231,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = { &envoy_config_listener_v3_ListenerFilter_submsgs[0], &envoy_config_listener_v3_ListenerFilter__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h index b5e46b8e87..b2000cbe94 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h @@ -33,6 +33,7 @@ typedef struct envoy_config_listener_v3_QuicProtocolOptions { upb_Message UPB_PR struct envoy_config_core_v3_QuicProtocolOptions; struct envoy_config_core_v3_RuntimeFeatureFlag; struct envoy_config_core_v3_TypedExtensionConfig; +struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; @@ -218,10 +219,42 @@ UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_server_preferre const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_clear_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_QuicProtocolOptions_send_disable_active_migration(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_send_disable_active_migration(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_clear_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_connection_debug_visitor_config(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; + const struct envoy_config_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_connection_debug_visitor_config(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_listener_v3_QuicProtocolOptions_mutable_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_listener_v3_QuicProtocolOptions_quic_protocol_options(msg); @@ -233,7 +266,7 @@ UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_listene } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_idle_timeout(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_idle_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_idle_timeout(msg); @@ -245,7 +278,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtoco } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_handshake_timeout(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_handshake_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_crypto_handshake_timeout(msg); @@ -257,7 +290,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtoco } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_enabled(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_RuntimeFeatureFlag* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_listener_v3_QuicProtocolOptions_mutable_enabled(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFeatureFlag* sub = (struct envoy_config_core_v3_RuntimeFeatureFlag*)envoy_config_listener_v3_QuicProtocolOptions_enabled(msg); @@ -269,7 +302,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_listener } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_packets_to_read_to_connection_count_ratio(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_QuicProtocolOptions_mutable_packets_to_read_to_connection_count_ratio(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_QuicProtocolOptions_packets_to_read_to_connection_count_ratio(msg); @@ -281,7 +314,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_QuicProt } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_stream_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_stream_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_crypto_stream_config(msg); @@ -293,7 +326,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_proof_source_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_proof_source_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_proof_source_config(msg); @@ -305,7 +338,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_connection_id_generator_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_connection_id_generator_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_connection_id_generator_config(msg); @@ -317,7 +350,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_server_preferred_address_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_server_preferred_address_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_server_preferred_address_config(msg); @@ -327,6 +360,30 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } return sub; } +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_QuicProtocolOptions_mutable_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_QuicProtocolOptions_send_disable_active_migration(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_send_disable_active_migration(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_connection_debug_visitor_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_connection_debug_visitor_config(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c index 72796ed446..e98406c2fb 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c @@ -21,7 +21,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[9] = { +static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -31,9 +31,11 @@ static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_subms {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[9] = { +static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[11] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -43,12 +45,17 @@ static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fi {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = { &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0], &envoy_config_listener_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(48, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.QuicProtocolOptions", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h index 2cd8e99510..c8193d5c0c 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h @@ -120,7 +120,7 @@ UPB_INLINE bool envoy_config_listener_v3_UdpListenerConfig_has_udp_packet_packet UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_core_v3_UdpSocketConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UdpSocketConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_UdpSocketConfig* sub = (struct envoy_config_core_v3_UdpSocketConfig*)envoy_config_listener_v3_UdpListenerConfig_downstream_socket_config(msg); @@ -132,7 +132,7 @@ UPB_INLINE struct envoy_config_core_v3_UdpSocketConfig* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_quic_options(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_listener_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v3_UdpListenerConfig_mutable_quic_options(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_listener_v3_QuicProtocolOptions* sub = (struct envoy_config_listener_v3_QuicProtocolOptions*)envoy_config_listener_v3_UdpListenerConfig_quic_options(msg); @@ -144,7 +144,7 @@ UPB_INLINE struct envoy_config_listener_v3_QuicProtocolOptions* envoy_config_lis } UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_udp_packet_packet_writer_config(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_udp_packet_packet_writer_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_UdpListenerConfig_udp_packet_packet_writer_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c index 8552f7b5d8..8bb9a2bd1a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c @@ -33,12 +33,18 @@ const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = { &envoy_config_listener_v3_UdpListenerConfig_submsgs[0], &envoy_config_listener_v3_UdpListenerConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.UdpListenerConfig", +#endif }; const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ActiveRawUdpListenerConfig", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h index c5e1a21014..748a211d58 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h @@ -145,7 +145,7 @@ UPB_INLINE int32_t envoy_config_metrics_v3_MetricsServiceConfig_histogram_emit_m UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v3_MetricsServiceConfig_mutable_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_metrics_v3_MetricsServiceConfig_grpc_service(msg); @@ -157,7 +157,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v3_Metr } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_report_counters_as_deltas(envoy_config_metrics_v3_MetricsServiceConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_MetricsServiceConfig_mutable_report_counters_as_deltas(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_MetricsServiceConfig_report_counters_as_deltas(msg); @@ -169,15 +169,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_MetricsServ } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_transport_api_version(envoy_config_metrics_v3_MetricsServiceConfig *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_emit_tags_as_labels(envoy_config_metrics_v3_MetricsServiceConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_mode(envoy_config_metrics_v3_MetricsServiceConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c index 73b43ea678..be12b7b551 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0], &envoy_config_metrics_v3_MetricsServiceConfig__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.MetricsServiceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h index f6a32627e9..6dd6e11085 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h @@ -120,11 +120,11 @@ UPB_INLINE bool envoy_config_metrics_v3_StatsSink_has_typed_config(const envoy_c UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_name(envoy_config_metrics_v3_StatsSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_typed_config(envoy_config_metrics_v3_StatsSink *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_mutable_typed_config(envoy_config_metrics_v3_StatsSink* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_metrics_v3_StatsSink_typed_config(msg); @@ -300,7 +300,7 @@ UPB_INLINE struct envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_ } UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(envoy_config_metrics_v3_StatsConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig_mutable_use_all_default_tags(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_StatsConfig_use_all_default_tags(msg); @@ -312,7 +312,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig } UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_stats_matcher(envoy_config_metrics_v3_StatsConfig *msg, envoy_config_metrics_v3_StatsMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsConfig_mutable_stats_matcher(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) { struct envoy_config_metrics_v3_StatsMatcher* sub = (struct envoy_config_metrics_v3_StatsMatcher*)envoy_config_metrics_v3_StatsConfig_stats_matcher(msg); @@ -451,11 +451,11 @@ UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_has_inclusion_list(const en UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_reject_all(envoy_config_metrics_v3_StatsMatcher *msg, bool value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_exclusion_list(envoy_config_metrics_v3_StatsMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_exclusion_list(msg); @@ -467,7 +467,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_ } UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_inclusion_list(envoy_config_metrics_v3_StatsMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_inclusion_list(msg); @@ -571,15 +571,15 @@ UPB_INLINE bool envoy_config_metrics_v3_TagSpecifier_has_fixed_value(const envoy UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_tag_name(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_regex(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_fixed_value(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.metrics.v3.HistogramBucketSettings */ @@ -669,7 +669,7 @@ UPB_INLINE upb_Array* _envoy_config_metrics_v3_HistogramBucketSettings_buckets_m UPB_INLINE void envoy_config_metrics_v3_HistogramBucketSettings_set_match(envoy_config_metrics_v3_HistogramBucketSettings *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_metrics_v3_HistogramBucketSettings_mutable_match(envoy_config_metrics_v3_HistogramBucketSettings* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_metrics_v3_HistogramBucketSettings_match(msg); @@ -801,7 +801,7 @@ UPB_INLINE upb_StringView envoy_config_metrics_v3_StatsdSink_prefix(const envoy_ UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_address(envoy_config_metrics_v3_StatsdSink *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSink_mutable_address(envoy_config_metrics_v3_StatsdSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_StatsdSink_address(msg); @@ -813,11 +813,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSi } UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_tcp_cluster_name(envoy_config_metrics_v3_StatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_prefix(envoy_config_metrics_v3_StatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.metrics.v3.DogStatsdSink */ @@ -912,7 +912,7 @@ UPB_INLINE bool envoy_config_metrics_v3_DogStatsdSink_has_max_bytes_per_datagram UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_address(envoy_config_metrics_v3_DogStatsdSink *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStatsdSink_mutable_address(envoy_config_metrics_v3_DogStatsdSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_DogStatsdSink_address(msg); @@ -924,11 +924,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStats } UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_prefix(envoy_config_metrics_v3_DogStatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_max_bytes_per_datagram(envoy_config_metrics_v3_DogStatsdSink *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_metrics_v3_DogStatsdSink_mutable_max_bytes_per_datagram(envoy_config_metrics_v3_DogStatsdSink* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_metrics_v3_DogStatsdSink_max_bytes_per_datagram(msg); @@ -990,7 +990,7 @@ UPB_INLINE int64_t envoy_config_metrics_v3_HystrixSink_num_buckets(const envoy_c UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config_metrics_v3_HystrixSink *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c index 9927e3ea13..fe1d316c05 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = { &envoy_config_metrics_v3_StatsSink_submsgs[0], &envoy_config_metrics_v3_StatsSink__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = { &envoy_config_metrics_v3_StatsConfig_submsgs[0], &envoy_config_metrics_v3_StatsConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -85,6 +91,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = { &envoy_config_metrics_v3_StatsMatcher_submsgs[0], &envoy_config_metrics_v3_StatsMatcher__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pob1_1bt}, @@ -103,6 +112,9 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = { NULL, &envoy_config_metrics_v3_TagSpecifier__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.TagSpecifier", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0], &envoy_config_metrics_v3_HistogramBucketSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.HistogramBucketSettings", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -146,6 +161,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = { &envoy_config_metrics_v3_StatsdSink_submsgs[0], &envoy_config_metrics_v3_StatsdSink__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsdSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -169,6 +187,9 @@ const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = { &envoy_config_metrics_v3_DogStatsdSink_submsgs[0], &envoy_config_metrics_v3_DogStatsdSink__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.DogStatsdSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0028000c0100000a, &upb_pom_1bt_maxmaxb}, @@ -185,6 +206,9 @@ const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init = { NULL, &envoy_config_metrics_v3_HystrixSink__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.HystrixSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h index 35173b99fb..d4e55ed495 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h @@ -125,11 +125,11 @@ UPB_INLINE bool envoy_config_overload_v3_ResourceMonitor_has_typed_config(const UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_name(envoy_config_overload_v3_ResourceMonitor *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_typed_config(envoy_config_overload_v3_ResourceMonitor *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_ResourceMonitor_mutable_typed_config(envoy_config_overload_v3_ResourceMonitor* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_ResourceMonitor_typed_config(msg); @@ -191,7 +191,7 @@ UPB_INLINE double envoy_config_overload_v3_ThresholdTrigger_value(const envoy_co UPB_INLINE void envoy_config_overload_v3_ThresholdTrigger_set_value(envoy_config_overload_v3_ThresholdTrigger *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.ScaledTrigger */ @@ -257,11 +257,11 @@ UPB_INLINE double envoy_config_overload_v3_ScaledTrigger_saturation_threshold(co UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_scaling_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_saturation_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.Trigger */ @@ -357,11 +357,11 @@ UPB_INLINE bool envoy_config_overload_v3_Trigger_has_scaled(const envoy_config_o UPB_INLINE void envoy_config_overload_v3_Trigger_set_name(envoy_config_overload_v3_Trigger *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_Trigger_set_threshold(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ThresholdTrigger* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_Trigger_mutable_threshold(envoy_config_overload_v3_Trigger* msg, upb_Arena* arena) { struct envoy_config_overload_v3_ThresholdTrigger* sub = (struct envoy_config_overload_v3_ThresholdTrigger*)envoy_config_overload_v3_Trigger_threshold(msg); @@ -373,7 +373,7 @@ UPB_INLINE struct envoy_config_overload_v3_ThresholdTrigger* envoy_config_overlo } UPB_INLINE void envoy_config_overload_v3_Trigger_set_scaled(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ScaledTrigger* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Trigger_mutable_scaled(envoy_config_overload_v3_Trigger* msg, upb_Arena* arena) { struct envoy_config_overload_v3_ScaledTrigger* sub = (struct envoy_config_overload_v3_ScaledTrigger*)envoy_config_overload_v3_Trigger_scaled(msg); @@ -577,11 +577,11 @@ UPB_INLINE bool envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTi UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_timer(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_timeout(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_timeout(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_timeout(msg); @@ -593,7 +593,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimers } UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_scale(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_scale(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_scale(msg); @@ -703,7 +703,7 @@ UPB_INLINE bool envoy_config_overload_v3_OverloadAction_has_typed_config(const e UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_name(envoy_config_overload_v3_OverloadAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_OverloadAction_mutable_triggers(envoy_config_overload_v3_OverloadAction* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -737,7 +737,7 @@ UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Ove } UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_typed_config(envoy_config_overload_v3_OverloadAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_OverloadAction_mutable_typed_config(envoy_config_overload_v3_OverloadAction* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_OverloadAction_typed_config(msg); @@ -831,7 +831,7 @@ UPB_INLINE upb_Array* _envoy_config_overload_v3_LoadShedPoint_triggers_mutable_u UPB_INLINE void envoy_config_overload_v3_LoadShedPoint_set_name(envoy_config_overload_v3_LoadShedPoint *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_LoadShedPoint_mutable_triggers(envoy_config_overload_v3_LoadShedPoint* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -915,7 +915,7 @@ UPB_INLINE uint32_t envoy_config_overload_v3_BufferFactoryConfig_minimum_account UPB_INLINE void envoy_config_overload_v3_BufferFactoryConfig_set_minimum_account_to_track_power_of_two(envoy_config_overload_v3_BufferFactoryConfig *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.OverloadManager */ @@ -1085,7 +1085,7 @@ UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadManager_loadshed_points_ UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_refresh_interval(envoy_config_overload_v3_OverloadManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_OverloadManager_mutable_refresh_interval(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_OverloadManager_refresh_interval(msg); @@ -1157,7 +1157,7 @@ UPB_INLINE struct envoy_config_overload_v3_OverloadAction* envoy_config_overload } UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_buffer_factory_config(envoy_config_overload_v3_OverloadManager *msg, envoy_config_overload_v3_BufferFactoryConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v3_OverloadManager_mutable_buffer_factory_config(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { struct envoy_config_overload_v3_BufferFactoryConfig* sub = (struct envoy_config_overload_v3_BufferFactoryConfig*)envoy_config_overload_v3_OverloadManager_buffer_factory_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c index 5edc477fc7..691509aeb5 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = { &envoy_config_overload_v3_ResourceMonitor_submsgs[0], &envoy_config_overload_v3_ResourceMonitor__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ResourceMonitor", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init = { NULL, &envoy_config_overload_v3_ThresholdTrigger__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ThresholdTrigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -62,6 +68,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = { NULL, &envoy_config_overload_v3_ScaledTrigger__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaledTrigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -85,6 +94,9 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = { &envoy_config_overload_v3_Trigger_submsgs[0], &envoy_config_overload_v3_Trigger__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.Trigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +117,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaleTimersOverloadActionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -126,6 +141,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -149,6 +167,9 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = { &envoy_config_overload_v3_OverloadAction_submsgs[0], &envoy_config_overload_v3_OverloadAction__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.OverloadAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -170,6 +191,9 @@ const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = { &envoy_config_overload_v3_LoadShedPoint_submsgs[0], &envoy_config_overload_v3_LoadShedPoint__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.LoadShedPoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -186,6 +210,9 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init = NULL, &envoy_config_overload_v3_BufferFactoryConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.BufferFactoryConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -212,6 +239,9 @@ const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = { &envoy_config_overload_v3_OverloadManager_submsgs[0], &envoy_config_overload_v3_OverloadManager__fields[0], UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.OverloadManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h index a51feef3eb..26fa4e55e3 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_config_rbac_v3_RBAC_has_audit_logging_options(const envoy_ UPB_INLINE void envoy_config_rbac_v3_RBAC_set_action(envoy_config_rbac_v3_RBAC *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_RBAC_policies_clear(envoy_config_rbac_v3_RBAC* msg) { const upb_MiniTableField field = {2, 16, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -197,7 +197,7 @@ UPB_INLINE envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_po } UPB_INLINE void envoy_config_rbac_v3_RBAC_set_audit_logging_options(envoy_config_rbac_v3_RBAC *msg, envoy_config_rbac_v3_RBAC_AuditLoggingOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_mutable_audit_logging_options(envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)envoy_config_rbac_v3_RBAC_audit_logging_options(msg); @@ -291,7 +291,7 @@ UPB_INLINE upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_conf UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_set_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_mutable_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -391,7 +391,7 @@ UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_ UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_mutable_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(msg); @@ -403,7 +403,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v } UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.rbac.v3.RBAC.PoliciesEntry */ @@ -622,7 +622,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Policy_ad } UPB_INLINE void envoy_config_rbac_v3_Policy_set_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mutable_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)envoy_config_rbac_v3_Policy_condition(msg); @@ -634,7 +634,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mut } UPB_INLINE void envoy_config_rbac_v3_Policy_set_checked_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_mutable_checked_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)envoy_config_rbac_v3_Policy_checked_condition(msg); @@ -694,6 +694,7 @@ typedef enum { envoy_config_rbac_v3_Permission_rule_not_rule = 8, envoy_config_rbac_v3_Permission_rule_requested_server_name = 9, envoy_config_rbac_v3_Permission_rule_matcher = 12, + envoy_config_rbac_v3_Permission_rule_uri_template = 13, envoy_config_rbac_v3_Permission_rule_NOT_SET = 0 } envoy_config_rbac_v3_Permission_rule_oneofcases; UPB_INLINE envoy_config_rbac_v3_Permission_rule_oneofcases envoy_config_rbac_v3_Permission_rule_case(const envoy_config_rbac_v3_Permission* msg) { @@ -893,10 +894,26 @@ UPB_INLINE bool envoy_config_rbac_v3_Permission_has_matcher(const envoy_config_r const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_rbac_v3_Permission_clear_uri_template(envoy_config_rbac_v3_Permission* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_uri_template(const envoy_config_rbac_v3_Permission* msg) { + const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; + const struct envoy_config_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_rbac_v3_Permission_has_uri_template(const envoy_config_rbac_v3_Permission* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_rbac_v3_Permission_set_and_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_and_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_and_rules(msg); @@ -908,7 +925,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_or_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_or_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_or_rules(msg); @@ -920,11 +937,11 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_any(envoy_config_rbac_v3_Permission *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Permission_set_header(envoy_config_rbac_v3_Permission *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_mutable_header(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Permission_header(msg); @@ -936,7 +953,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_ip(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_mutable_destination_ip(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Permission_destination_ip(msg); @@ -948,11 +965,11 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permissio } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port(envoy_config_rbac_v3_Permission *msg, uint32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Permission_set_metadata(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_mutable_metadata(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Permission_metadata(msg); @@ -964,7 +981,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Pe } UPB_INLINE void envoy_config_rbac_v3_Permission_set_not_rule(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_mutable_not_rule(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)envoy_config_rbac_v3_Permission_not_rule(msg); @@ -976,7 +993,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permissi } UPB_INLINE void envoy_config_rbac_v3_Permission_set_requested_server_name(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_mutable_requested_server_name(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Permission_requested_server_name(msg); @@ -988,7 +1005,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_url_path(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_PathMatcher* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_mutable_url_path(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Permission_url_path(msg); @@ -1000,7 +1017,7 @@ UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permis } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port_range(envoy_config_rbac_v3_Permission *msg, struct envoy_type_v3_Int32Range* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_mutable_destination_port_range(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_rbac_v3_Permission_destination_port_range(msg); @@ -1012,7 +1029,7 @@ UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_muta } UPB_INLINE void envoy_config_rbac_v3_Permission_set_matcher(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_matcher(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_matcher(msg); @@ -1022,6 +1039,18 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v } return sub; } +UPB_INLINE void envoy_config_rbac_v3_Permission_set_uri_template(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_uri_template(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_uri_template(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_config_rbac_v3_Permission_set_uri_template(msg, sub); + } + return sub; +} /* envoy.config.rbac.v3.Permission.Set */ @@ -1374,7 +1403,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Principal_has_filter_state(const envoy_conf UPB_INLINE void envoy_config_rbac_v3_Principal_set_and_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_and_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_and_ids(msg); @@ -1386,7 +1415,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princ } UPB_INLINE void envoy_config_rbac_v3_Principal_set_or_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_or_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_or_ids(msg); @@ -1398,11 +1427,11 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princ } UPB_INLINE void envoy_config_rbac_v3_Principal_set_any(envoy_config_rbac_v3_Principal *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Principal_set_authenticated(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Authenticated* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_mutable_authenticated(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Authenticated* sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)envoy_config_rbac_v3_Principal_authenticated(msg); @@ -1414,7 +1443,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rba } UPB_INLINE void envoy_config_rbac_v3_Principal_set_source_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_source_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_source_ip(msg); @@ -1426,7 +1455,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_header(envoy_config_rbac_v3_Principal *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_mutable_header(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Principal_header(msg); @@ -1438,7 +1467,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Prin } UPB_INLINE void envoy_config_rbac_v3_Principal_set_metadata(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_mutable_metadata(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Principal_metadata(msg); @@ -1450,7 +1479,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Pr } UPB_INLINE void envoy_config_rbac_v3_Principal_set_not_id(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_mutable_not_id(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)envoy_config_rbac_v3_Principal_not_id(msg); @@ -1462,7 +1491,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_url_path(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_PathMatcher* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_mutable_url_path(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Principal_url_path(msg); @@ -1474,7 +1503,7 @@ UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Princi } UPB_INLINE void envoy_config_rbac_v3_Principal_set_direct_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_direct_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_direct_remote_ip(msg); @@ -1486,7 +1515,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_remote_ip(msg); @@ -1498,7 +1527,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_filter_state(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_FilterStateMatcher* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_mutable_filter_state(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_FilterStateMatcher* sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)envoy_config_rbac_v3_Principal_filter_state(msg); @@ -1664,7 +1693,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Principal_Authenticated_has_principal_name( UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(envoy_config_rbac_v3_Principal_Authenticated *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_mutable_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Principal_Authenticated_principal_name(msg); @@ -1738,11 +1767,11 @@ UPB_INLINE int32_t envoy_config_rbac_v3_Action_action(const envoy_config_rbac_v3 UPB_INLINE void envoy_config_rbac_v3_Action_set_name(envoy_config_rbac_v3_Action *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Action *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c index 0f31ce98e0..a4684678b0 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c @@ -42,6 +42,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = { &envoy_config_rbac_v3_RBAC_submsgs[0], &envoy_config_rbac_v3_RBAC__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0], &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.AuditLoggingOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -82,6 +88,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0], &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -103,6 +112,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = { &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0], &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.PoliciesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -127,6 +139,9 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { &envoy_config_rbac_v3_Policy_submsgs[0], &envoy_config_rbac_v3_Policy__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Policy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -135,7 +150,7 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = { +static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, @@ -146,9 +161,10 @@ static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__PathMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int32Range_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = { +static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = { {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -161,12 +177,16 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = { {10, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {11, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { &envoy_config_rbac_v3_Permission_submsgs[0], &envoy_config_rbac_v3_Permission__fields[0], - UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Permission", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -181,7 +201,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { {0x001000080a070052, &upb_pom_1bt_maxmaxb}, {0x001000080b08005a, &upb_pom_1bt_maxmaxb}, {0x001000080c090062, &upb_pom_1bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000080d0a006a, &upb_pom_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) @@ -199,6 +219,9 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = { &envoy_config_rbac_v3_Permission_Set_submsgs[0], &envoy_config_rbac_v3_Permission_Set__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Permission.Set", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -238,6 +261,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = { &envoy_config_rbac_v3_Principal_submsgs[0], &envoy_config_rbac_v3_Principal__fields[0], UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -270,6 +296,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = { &envoy_config_rbac_v3_Principal_Set_submsgs[0], &envoy_config_rbac_v3_Principal_Set__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal.Set", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -288,6 +317,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0], &envoy_config_rbac_v3_Principal_Authenticated__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal.Authenticated", +#endif }; static const upb_MiniTableField envoy_config_rbac_v3_Action__fields[2] = { @@ -299,6 +331,9 @@ const upb_MiniTable envoy__config__rbac__v3__Action_msg_init = { NULL, &envoy_config_rbac_v3_Action__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Action", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h index edccc69572..316e10867f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h @@ -479,7 +479,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_metadata(const envo UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_name(envoy_config_route_v3_RouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(72, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_VirtualHost** envoy_config_route_v3_RouteConfiguration_mutable_virtual_hosts(envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -629,7 +629,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_validate_clusters(envoy_config_route_v3_RouteConfiguration *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteConfiguration_mutable_validate_clusters(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteConfiguration_validate_clusters(msg); @@ -669,7 +669,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_request_headers_to_ } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_vhds(envoy_config_route_v3_RouteConfiguration *msg, envoy_config_route_v3_Vhds* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfiguration_mutable_vhds(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_Vhds* sub = (struct envoy_config_route_v3_Vhds*)envoy_config_route_v3_RouteConfiguration_vhds(msg); @@ -681,11 +681,11 @@ UPB_INLINE struct envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfigu } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_most_specific_header_mutations_wins(envoy_config_route_v3_RouteConfiguration *msg, bool value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_max_direct_response_body_size_bytes(envoy_config_route_v3_RouteConfiguration *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 96), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteConfiguration_mutable_max_direct_response_body_size_bytes(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteConfiguration_max_direct_response_body_size_bytes(msg); @@ -757,11 +757,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_ignore_port_in_host_matching(envoy_config_route_v3_RouteConfiguration *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_ignore_path_parameters_in_path_matching(envoy_config_route_v3_RouteConfiguration *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(61, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_clear(envoy_config_route_v3_RouteConfiguration* msg) { const upb_MiniTableField field = {16, UPB_SIZE(64, 120), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -790,7 +790,7 @@ UPB_INLINE envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry* e } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_metadata(envoy_config_route_v3_RouteConfiguration *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 128), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteConfiguration_mutable_metadata(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_RouteConfiguration_metadata(msg); @@ -877,7 +877,7 @@ UPB_INLINE bool envoy_config_route_v3_Vhds_has_config_source(const envoy_config_ UPB_INLINE void envoy_config_route_v3_Vhds_set_config_source(envoy_config_route_v3_Vhds *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_mutable_config_source(envoy_config_route_v3_Vhds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_route_v3_Vhds_config_source(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c index 146e1d3f5c..e5104c4c82 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c @@ -57,6 +57,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = { &envoy_config_route_v3_RouteConfiguration_submsgs[0], &envoy_config_route_v3_RouteConfiguration__fields[0], UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 17, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteConfiguration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -90,6 +93,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilter &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -108,6 +114,9 @@ const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = { &envoy_config_route_v3_Vhds_submsgs[0], &envoy_config_route_v3_Vhds__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Vhds", +#endif }; static const upb_MiniTable *messages_layout[3] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h index 9ad0428901..2031387493 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h @@ -683,7 +683,7 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_has_metadata(const envoy_confi UPB_INLINE void envoy_config_route_v3_VirtualHost_set_name(envoy_config_route_v3_VirtualHost *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(96, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_route_v3_VirtualHost_mutable_domains(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -745,7 +745,7 @@ UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_VirtualHost } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_require_tls(envoy_config_route_v3_VirtualHost *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_VirtualCluster** envoy_config_route_v3_VirtualHost_mutable_virtual_clusters(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -839,7 +839,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_cors(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_CorsPolicy* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 64, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_VirtualHost_mutable_cors(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_VirtualHost_cors(msg); @@ -937,7 +937,7 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_add_request_headers_to_remove( } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_request_attempt_count(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(52, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_typed_per_filter_config_clear(envoy_config_route_v3_VirtualHost* msg) { const upb_MiniTableField field = {15, UPB_SIZE(56, 112), 0, 6, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -966,7 +966,7 @@ UPB_INLINE envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry* envoy_co } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_RetryPolicy* value) { const upb_MiniTableField field = {16, UPB_SIZE(60, 120), 65, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_VirtualHost_mutable_retry_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_VirtualHost_retry_policy(msg); @@ -978,7 +978,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_Virtu } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_hedge_policy(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_HedgePolicy* value) { const upb_MiniTableField field = {17, UPB_SIZE(64, 128), 66, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_VirtualHost_mutable_hedge_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_VirtualHost_hedge_policy(msg); @@ -990,7 +990,7 @@ UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_Virtu } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_per_request_buffer_limit_bytes(envoy_config_route_v3_VirtualHost *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {18, UPB_SIZE(68, 136), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_VirtualHost_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_VirtualHost_per_request_buffer_limit_bytes(msg); @@ -1002,11 +1002,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_VirtualHost } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_attempt_count_in_response(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(72, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy_typed_config(envoy_config_route_v3_VirtualHost *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {20, UPB_SIZE(76, 144), 68, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_mutable_retry_policy_typed_config(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_VirtualHost_retry_policy_typed_config(msg); @@ -1018,7 +1018,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_mutable } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_matcher(envoy_config_route_v3_VirtualHost *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {21, UPB_SIZE(80, 152), 69, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_route_v3_VirtualHost_mutable_matcher(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_route_v3_VirtualHost_matcher(msg); @@ -1060,11 +1060,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_is_timeout_retry_header(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(88, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_metadata(envoy_config_route_v3_VirtualHost *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {24, UPB_SIZE(92, 168), 70, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_VirtualHost_mutable_metadata(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_VirtualHost_metadata(msg); @@ -1151,7 +1151,7 @@ UPB_INLINE bool envoy_config_route_v3_FilterAction_has_action(const envoy_config UPB_INLINE void envoy_config_route_v3_FilterAction_set_action(envoy_config_route_v3_FilterAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterAction_mutable_action(envoy_config_route_v3_FilterAction* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterAction_action(msg); @@ -1655,7 +1655,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_Route_stat_prefix(const envoy_co UPB_INLINE void envoy_config_route_v3_Route_set_match(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RouteMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_mutable_match(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch* sub = (struct envoy_config_route_v3_RouteMatch*)envoy_config_route_v3_Route_match(msg); @@ -1667,7 +1667,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_ } UPB_INLINE void envoy_config_route_v3_Route_set_route(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RouteAction* value) { const upb_MiniTableField field = {2, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route_mutable_route(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction* sub = (struct envoy_config_route_v3_RouteAction*)envoy_config_route_v3_Route_route(msg); @@ -1679,7 +1679,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_Route_set_redirect(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RedirectAction* value) { const upb_MiniTableField field = {3, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Route_mutable_redirect(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RedirectAction* sub = (struct envoy_config_route_v3_RedirectAction*)envoy_config_route_v3_Route_redirect(msg); @@ -1691,7 +1691,7 @@ UPB_INLINE struct envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Ro } UPB_INLINE void envoy_config_route_v3_Route_set_metadata(envoy_config_route_v3_Route *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Route_mutable_metadata(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_Route_metadata(msg); @@ -1703,7 +1703,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Route_mut } UPB_INLINE void envoy_config_route_v3_Route_set_decorator(envoy_config_route_v3_Route *msg, envoy_config_route_v3_Decorator* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 32), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_mutable_decorator(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_Decorator* sub = (struct envoy_config_route_v3_Decorator*)envoy_config_route_v3_Route_decorator(msg); @@ -1715,7 +1715,7 @@ UPB_INLINE struct envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_m } UPB_INLINE void envoy_config_route_v3_Route_set_direct_response(envoy_config_route_v3_Route *msg, envoy_config_route_v3_DirectResponseAction* value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_Route_mutable_direct_response(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_DirectResponseAction* sub = (struct envoy_config_route_v3_DirectResponseAction*)envoy_config_route_v3_Route_direct_response(msg); @@ -1868,11 +1868,11 @@ UPB_INLINE envoy_config_route_v3_Route_TypedPerFilterConfigEntry* envoy_config_r } UPB_INLINE void envoy_config_route_v3_Route_set_name(envoy_config_route_v3_Route *msg, upb_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_Route_set_tracing(envoy_config_route_v3_Route *msg, envoy_config_route_v3_Tracing* value) { const upb_MiniTableField field = {15, UPB_SIZE(44, 96), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_mutable_tracing(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_Tracing* sub = (struct envoy_config_route_v3_Tracing*)envoy_config_route_v3_Route_tracing(msg); @@ -1884,7 +1884,7 @@ UPB_INLINE struct envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_mut } UPB_INLINE void envoy_config_route_v3_Route_set_per_request_buffer_limit_bytes(envoy_config_route_v3_Route *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(48, 104), 68, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_Route_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_Route_per_request_buffer_limit_bytes(msg); @@ -1896,7 +1896,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_Route_mutab } UPB_INLINE void envoy_config_route_v3_Route_set_filter_action(envoy_config_route_v3_Route *msg, envoy_config_route_v3_FilterAction* value) { const upb_MiniTableField field = {17, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_FilterAction* envoy_config_route_v3_Route_mutable_filter_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_FilterAction* sub = (struct envoy_config_route_v3_FilterAction*)envoy_config_route_v3_Route_filter_action(msg); @@ -1908,7 +1908,7 @@ UPB_INLINE struct envoy_config_route_v3_FilterAction* envoy_config_route_v3_Rout } UPB_INLINE void envoy_config_route_v3_Route_set_non_forwarding_action(envoy_config_route_v3_Route *msg, envoy_config_route_v3_NonForwardingAction* value) { const upb_MiniTableField field = {18, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_Route_mutable_non_forwarding_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_NonForwardingAction* sub = (struct envoy_config_route_v3_NonForwardingAction*)envoy_config_route_v3_Route_non_forwarding_action(msg); @@ -1920,7 +1920,7 @@ UPB_INLINE struct envoy_config_route_v3_NonForwardingAction* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_Route_set_stat_prefix(envoy_config_route_v3_Route *msg, upb_StringView value) { const upb_MiniTableField field = {19, UPB_SIZE(68, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.Route.TypedPerFilterConfigEntry */ @@ -2098,11 +2098,11 @@ UPB_INLINE struct envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_con } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_runtime_key_prefix(envoy_config_route_v3_WeightedCluster *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_total_weight(envoy_config_route_v3_WeightedCluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_mutable_total_weight(envoy_config_route_v3_WeightedCluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_total_weight(msg); @@ -2114,7 +2114,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedClu } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_header_name(envoy_config_route_v3_WeightedCluster *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), UPB_SIZE(-21, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.WeightedCluster.ClusterWeight */ @@ -2394,11 +2394,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_WeightedCluster_ClusterWeight_cl UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_name(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_weight(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_weight(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_ClusterWeight_weight(msg); @@ -2410,7 +2410,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedClu } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_metadata_match(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_metadata_match(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_WeightedCluster_ClusterWeight_metadata_match(msg); @@ -2563,11 +2563,11 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterCon } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_host_rewrite_literal(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_cluster_header(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry */ @@ -2658,7 +2658,7 @@ UPB_INLINE bool envoy_config_route_v3_ClusterSpecifierPlugin_is_optional(const e UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_extension(envoy_config_route_v3_ClusterSpecifierPlugin *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_ClusterSpecifierPlugin_mutable_extension(envoy_config_route_v3_ClusterSpecifierPlugin* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_ClusterSpecifierPlugin_extension(msg); @@ -2670,7 +2670,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_is_optional(envoy_config_route_v3_ClusterSpecifierPlugin *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteMatch */ @@ -2982,15 +2982,15 @@ UPB_INLINE bool envoy_config_route_v3_RouteMatch_has_path_match_policy(const env UPB_INLINE void envoy_config_route_v3_RouteMatch_set_prefix(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_case_sensitive(envoy_config_route_v3_RouteMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_mutable_case_sensitive(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_case_sensitive(msg); @@ -3062,7 +3062,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_grpc(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(24, 56), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_route_v3_RouteMatch_mutable_grpc(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)envoy_config_route_v3_RouteMatch_grpc(msg); @@ -3074,7 +3074,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_ } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_runtime_fraction(envoy_config_route_v3_RouteMatch *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 64), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteMatch_mutable_runtime_fraction(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteMatch_runtime_fraction(msg); @@ -3086,7 +3086,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_safe_regex(envoy_config_route_v3_RouteMatch *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_RouteMatch_mutable_safe_regex(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_RouteMatch_safe_regex(msg); @@ -3098,7 +3098,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_Rout } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_tls_context(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* value) { const upb_MiniTableField field = {11, UPB_SIZE(32, 72), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config_route_v3_RouteMatch_mutable_tls_context(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)envoy_config_route_v3_RouteMatch_tls_context(msg); @@ -3110,7 +3110,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_connect_matcher(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_ConnectMatcher* value) { const upb_MiniTableField field = {12, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v3_RouteMatch_mutable_connect_matcher(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_ConnectMatcher* sub = (struct envoy_config_route_v3_RouteMatch_ConnectMatcher*)envoy_config_route_v3_RouteMatch_connect_matcher(msg); @@ -3152,11 +3152,11 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_route_v3_R } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_separated_prefix(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_match_policy(envoy_config_route_v3_RouteMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {15, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteMatch_mutable_path_match_policy(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteMatch_path_match_policy(msg); @@ -3276,7 +3276,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_has_vali UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_presented(msg); @@ -3288,7 +3288,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_Tl } UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_validated(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_validated(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_validated(msg); @@ -3378,54 +3378,54 @@ typedef enum { envoy_config_route_v3_CorsPolicy_enabled_specifier_NOT_SET = 0 } envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases; UPB_INLINE envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases envoy_config_route_v3_CorsPolicy_enabled_specifier_case(const envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_allow_methods(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_allow_methods(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_allow_headers(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_allow_headers(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_expose_headers(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_expose_headers(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_max_age(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_max_age(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3447,19 +3447,19 @@ UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_allow_credentials(const env return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_filter_enabled(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_filter_enabled(const envoy_config_route_v3_CorsPolicy* msg) { const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL; const struct envoy_config_core_v3_RuntimeFractionalPercent* ret; - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_filter_enabled(const envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_shadow_enabled(envoy_config_route_v3_CorsPolicy* msg) { @@ -3526,26 +3526,42 @@ UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_allow_private_network_acces const upb_MiniTableField field = {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_forward_not_matching_preflights(const envoy_config_route_v3_CorsPolicy* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_forward_not_matching_preflights(const envoy_config_route_v3_CorsPolicy* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_methods(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_headers(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_expose_headers(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_max_age(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_credentials(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_credentials(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_credentials(msg); @@ -3556,8 +3572,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu return sub; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_filter_enabled(envoy_config_route_v3_CorsPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_filter_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_filter_enabled(msg); @@ -3569,7 +3585,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_shadow_enabled(envoy_config_route_v3_CorsPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 88), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_shadow_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_shadow_enabled(msg); @@ -3611,7 +3627,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Cor } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_private_network_access(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_private_network_access(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_private_network_access(msg); @@ -3621,6 +3637,18 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu } return sub; } +UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_forward_not_matching_preflights(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_route_v3_CorsPolicy_set_forward_not_matching_preflights(msg, sub); + } + return sub; +} /* envoy.config.route.v3.RouteAction */ @@ -4274,15 +4302,15 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_has_path_rewrite_policy(const UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_header(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_weighted_clusters(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_WeightedCluster* value) { const upb_MiniTableField field = {3, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_RouteAction_mutable_weighted_clusters(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_WeightedCluster* sub = (struct envoy_config_route_v3_WeightedCluster*)envoy_config_route_v3_RouteAction_weighted_clusters(msg); @@ -4294,7 +4322,7 @@ UPB_INLINE struct envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_R } UPB_INLINE void envoy_config_route_v3_RouteAction_set_metadata_match(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 72), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteAction_mutable_metadata_match(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_RouteAction_metadata_match(msg); @@ -4306,15 +4334,15 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteActi } UPB_INLINE void envoy_config_route_v3_RouteAction_set_prefix_rewrite(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(132, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_literal(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_auto_host_rewrite(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_auto_host_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_auto_host_rewrite(msg); @@ -4326,7 +4354,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_m } UPB_INLINE void envoy_config_route_v3_RouteAction_set_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, UPB_SIZE(16, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_timeout(msg); @@ -4338,7 +4366,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_RetryPolicy* value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RouteAction_mutable_retry_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_RouteAction_retry_policy(msg); @@ -4350,7 +4378,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_RouteAction_set_priority(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {11, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RateLimit** envoy_config_route_v3_RouteAction_mutable_rate_limits(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(28, 112), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4384,7 +4412,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_RouteAc } UPB_INLINE void envoy_config_route_v3_RouteAction_set_include_vh_rate_limits(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(32, 120), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_include_vh_rate_limits(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_include_vh_rate_limits(msg); @@ -4426,7 +4454,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cors(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_CorsPolicy* value) { const upb_MiniTableField field = {17, UPB_SIZE(40, 136), 68, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteAction_mutable_cors(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_RouteAction_cors(msg); @@ -4438,11 +4466,11 @@ UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteA } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_not_found_response_code(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {20, UPB_SIZE(44, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_grpc_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {23, UPB_SIZE(48, 144), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_max_grpc_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_max_grpc_timeout(msg); @@ -4454,7 +4482,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_idle_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(52, 152), 70, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_idle_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_idle_timeout(msg); @@ -4496,11 +4524,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_ } UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_action(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {26, UPB_SIZE(60, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_hedge_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_HedgePolicy* value) { const upb_MiniTableField field = {27, UPB_SIZE(64, 168), 71, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_RouteAction_mutable_hedge_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_RouteAction_hedge_policy(msg); @@ -4512,7 +4540,7 @@ UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_RouteAction_set_grpc_timeout_offset(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {28, UPB_SIZE(68, 176), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_grpc_timeout_offset(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_grpc_timeout_offset(msg); @@ -4524,7 +4552,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_header(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {29, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_route_v3_RouteAction_mutable_request_mirror_policies(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {30, UPB_SIZE(72, 184), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4558,7 +4586,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_internal_redirects(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {31, UPB_SIZE(76, 192), 73, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteAction_mutable_max_internal_redirects(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteAction_max_internal_redirects(msg); @@ -4570,7 +4598,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteAction } UPB_INLINE void envoy_config_route_v3_RouteAction_set_regex_rewrite(envoy_config_route_v3_RouteAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {32, UPB_SIZE(80, 200), 74, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_regex_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_regex_rewrite(msg); @@ -4582,7 +4610,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy_typed_config(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {33, UPB_SIZE(84, 208), 75, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RouteAction_mutable_retry_policy_typed_config(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RouteAction_retry_policy_typed_config(msg); @@ -4594,7 +4622,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RouteAction_mutable } UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_InternalRedirectPolicy* value) { const upb_MiniTableField field = {34, UPB_SIZE(88, 216), 76, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_RouteAction_mutable_internal_redirect_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_InternalRedirectPolicy* sub = (struct envoy_config_route_v3_InternalRedirectPolicy*)envoy_config_route_v3_RouteAction_internal_redirect_policy(msg); @@ -4606,7 +4634,7 @@ UPB_INLINE struct envoy_config_route_v3_InternalRedirectPolicy* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_path_regex(envoy_config_route_v3_RouteAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {35, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_host_rewrite_path_regex(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_host_rewrite_path_regex(msg); @@ -4618,7 +4646,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_stream_duration(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_RouteAction_MaxStreamDuration* value) { const upb_MiniTableField field = {36, UPB_SIZE(96, 224), 77, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_route_v3_RouteAction_mutable_max_stream_duration(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_MaxStreamDuration* sub = (struct envoy_config_route_v3_RouteAction_MaxStreamDuration*)envoy_config_route_v3_RouteAction_max_stream_duration(msg); @@ -4630,15 +4658,15 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_specifier_plugin(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {37, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_append_x_forwarded_host(envoy_config_route_v3_RouteAction *msg, bool value) { const upb_MiniTableField field = {38, UPB_SIZE(100, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_inline_cluster_specifier_plugin(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_ClusterSpecifierPlugin* value) { const upb_MiniTableField field = {39, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_RouteAction_mutable_inline_cluster_specifier_plugin(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_ClusterSpecifierPlugin* sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)envoy_config_route_v3_RouteAction_inline_cluster_specifier_plugin(msg); @@ -4650,7 +4678,7 @@ UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_early_data_policy(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {40, UPB_SIZE(108, 232), 78, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_early_data_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_early_data_policy(msg); @@ -4662,7 +4690,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RouteAction_set_path_rewrite_policy(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {41, UPB_SIZE(112, 240), 79, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_path_rewrite_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_path_rewrite_policy(msg); @@ -4710,13 +4738,13 @@ UPB_INLINE char* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_serialize return ptr; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_cluster(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_RequestMirrorPolicy_cluster(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4754,25 +4782,37 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_RequestMirrorPolicy_has_trace_ return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_cluster_header(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_RequestMirrorPolicy_cluster_header(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_disable_shadow_host_suffix_append(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_route_v3_RouteAction_RequestMirrorPolicy_disable_shadow_host_suffix_append(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluster(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_runtime_fraction(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_runtime_fraction(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_runtime_fraction(msg); @@ -4784,7 +4824,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_trace_sampled(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_trace_sampled(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_trace_sampled(msg); @@ -4795,8 +4835,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_R return sub; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluster_header(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_disable_shadow_host_suffix_append(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, bool value) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy */ @@ -4943,7 +4987,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_has_filter_state(co UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_header(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_Header* value) { const upb_MiniTableField field = {1, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_route_v3_RouteAction_HashPolicy_mutable_header(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_Header* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Header*)envoy_config_route_v3_RouteAction_HashPolicy_header(msg); @@ -4955,7 +4999,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_cookie(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_Cookie* value) { const upb_MiniTableField field = {2, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_route_v3_RouteAction_HashPolicy_mutable_cookie(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)envoy_config_route_v3_RouteAction_HashPolicy_cookie(msg); @@ -4967,7 +5011,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_connection_properties(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* value) { const upb_MiniTableField field = {3, 16, -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* envoy_config_route_v3_RouteAction_HashPolicy_mutable_connection_properties(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)envoy_config_route_v3_RouteAction_HashPolicy_connection_properties(msg); @@ -4979,11 +5023,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionPropert } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_terminal(envoy_config_route_v3_RouteAction_HashPolicy *msg, bool value) { const upb_MiniTableField field = {4, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_query_parameter(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* value) { const upb_MiniTableField field = {5, 16, -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_config_route_v3_RouteAction_HashPolicy_mutable_query_parameter(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)envoy_config_route_v3_RouteAction_HashPolicy_query_parameter(msg); @@ -4995,7 +5039,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* e } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_filter_state(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_FilterState* value) { const upb_MiniTableField field = {6, 16, -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_config_route_v3_RouteAction_HashPolicy_mutable_filter_state(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)envoy_config_route_v3_RouteAction_HashPolicy_filter_state(msg); @@ -5073,11 +5117,11 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_Header_has_regex_re UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_header_name(envoy_config_route_v3_RouteAction_HashPolicy_Header *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_regex_rewrite(envoy_config_route_v3_RouteAction_HashPolicy_Header *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_HashPolicy_Header_mutable_regex_rewrite(envoy_config_route_v3_RouteAction_HashPolicy_Header* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite(msg); @@ -5151,11 +5195,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_CookieAtt UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_set_name(envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_set_value(envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.Cookie */ @@ -5269,11 +5313,11 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_HashPolicy_Cookie_attri UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_name(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_ttl(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_mutable_ttl(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_HashPolicy_Cookie_ttl(msg); @@ -5285,7 +5329,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ha } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_path(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute** envoy_config_route_v3_RouteAction_HashPolicy_Cookie_mutable_attributes(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5369,7 +5413,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_ConnectionPropertie UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_set_source_ip(envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter */ @@ -5423,7 +5467,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_QueryPara UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_set_name(envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.FilterState */ @@ -5477,7 +5521,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_FilterSta UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_FilterState_set_key(envoy_config_route_v3_RouteAction_HashPolicy_FilterState *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.UpgradeConfig */ @@ -5563,11 +5607,11 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_has_connect_conf UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_upgrade_type(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_enabled(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_enabled(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_UpgradeConfig_enabled(msg); @@ -5579,7 +5623,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_U } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_connect_config(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_connect_config(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_connect_config(msg); @@ -5657,7 +5701,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_al UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, struct envoy_config_core_v3_ProxyProtocolConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_mutable_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ProxyProtocolConfig* sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_proxy_protocol_config(msg); @@ -5669,7 +5713,7 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_allow_post(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.MaxStreamDuration */ @@ -5759,7 +5803,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_MaxStreamDuration_has_grpc_tim UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_max_stream_duration(msg); @@ -5771,7 +5815,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ma } UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_max(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_max(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_max(msg); @@ -5783,7 +5827,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ma } UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_offset(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_offset(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_offset(msg); @@ -6113,11 +6157,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_has_per_try_idle_timeout(const UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_on(envoy_config_route_v3_RetryPolicy *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(56, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_num_retries(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RetryPolicy_mutable_num_retries(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RetryPolicy_num_retries(msg); @@ -6129,7 +6173,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RetryPolicy } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_timeout(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_timeout(msg); @@ -6141,7 +6185,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mu } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_priority(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RetryPriority* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v3_RetryPolicy_mutable_retry_priority(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RetryPriority* sub = (struct envoy_config_route_v3_RetryPolicy_RetryPriority*)envoy_config_route_v3_RetryPolicy_retry_priority(msg); @@ -6183,7 +6227,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_co } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_host_selection_retry_max_attempts(envoy_config_route_v3_RetryPolicy *msg, int64_t value) { const upb_MiniTableField field = {6, 64, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* envoy_config_route_v3_RetryPolicy_mutable_retriable_status_codes(envoy_config_route_v3_RetryPolicy* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(28, 72), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6215,7 +6259,7 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_add_retriable_status_codes(env } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_back_off(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RetryBackOff* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 80), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RetryBackOff*)envoy_config_route_v3_RetryPolicy_retry_back_off(msg); @@ -6287,7 +6331,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Ret } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_rate_limited_retry_back_off(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* value) { const upb_MiniTableField field = {11, UPB_SIZE(44, 104), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_rate_limited_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)envoy_config_route_v3_RetryPolicy_rate_limited_retry_back_off(msg); @@ -6329,7 +6373,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_idle_timeout(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {13, UPB_SIZE(52, 120), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_idle_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_idle_timeout(msg); @@ -6416,11 +6460,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryPriority_has_typed_config UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_name(envoy_config_route_v3_RetryPolicy_RetryPriority *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_typed_config(envoy_config_route_v3_RetryPolicy_RetryPriority *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryPriority_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryPriority_typed_config(msg); @@ -6507,11 +6551,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryHostPredicate_has_typed_c UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_name(envoy_config_route_v3_RetryPolicy_RetryHostPredicate *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_typed_config(envoy_config_route_v3_RetryPolicy_RetryHostPredicate *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryHostPredicate_typed_config(msg); @@ -6593,7 +6637,7 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryBackOff_has_max_interval( UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_base_interval(msg); @@ -6605,7 +6649,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_Re } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_max_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_max_interval(msg); @@ -6679,11 +6723,11 @@ UPB_INLINE int32_t envoy_config_route_v3_RetryPolicy_ResetHeader_format(const en UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_set_name(envoy_config_route_v3_RetryPolicy_ResetHeader *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_set_format(envoy_config_route_v3_RetryPolicy_ResetHeader *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff */ @@ -6803,7 +6847,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_set_max_interval(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_max_interval(msg); @@ -6897,7 +6941,7 @@ UPB_INLINE bool envoy_config_route_v3_HedgePolicy_hedge_on_per_try_timeout(const UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_initial_requests(envoy_config_route_v3_HedgePolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_HedgePolicy_mutable_initial_requests(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_HedgePolicy_initial_requests(msg); @@ -6909,7 +6953,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_HedgePolicy } UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_additional_request_chance(envoy_config_route_v3_HedgePolicy *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_HedgePolicy_mutable_additional_request_chance(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_HedgePolicy_additional_request_chance(msg); @@ -6921,7 +6965,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_HedgePo } UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_hedge_on_per_try_timeout(envoy_config_route_v3_HedgePolicy *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RedirectAction */ @@ -7112,39 +7156,39 @@ UPB_INLINE bool envoy_config_route_v3_RedirectAction_has_regex_rewrite(const env UPB_INLINE void envoy_config_route_v3_RedirectAction_set_host_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(44, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_path_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 48), -25, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_response_code(envoy_config_route_v3_RedirectAction *msg, int32_t value) { const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_https_redirect(envoy_config_route_v3_RedirectAction *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 32), -17, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_prefix_rewrite(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(36, 48), -25, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_strip_query(envoy_config_route_v3_RedirectAction *msg, bool value) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_scheme_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 32), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_port_redirect(envoy_config_route_v3_RedirectAction *msg, uint32_t value) { const upb_MiniTableField field = {8, 20, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_regex_rewrite(envoy_config_route_v3_RedirectAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 48), -25, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RedirectAction_mutable_regex_rewrite(envoy_config_route_v3_RedirectAction* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RedirectAction_regex_rewrite(msg); @@ -7222,11 +7266,11 @@ UPB_INLINE bool envoy_config_route_v3_DirectResponseAction_has_body(const envoy_ UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_status(envoy_config_route_v3_DirectResponseAction *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_body(envoy_config_route_v3_DirectResponseAction *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_route_v3_DirectResponseAction_mutable_body(envoy_config_route_v3_DirectResponseAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_route_v3_DirectResponseAction_body(msg); @@ -7342,11 +7386,11 @@ UPB_INLINE bool envoy_config_route_v3_Decorator_has_propagate(const envoy_config UPB_INLINE void envoy_config_route_v3_Decorator_set_operation(envoy_config_route_v3_Decorator *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_Decorator_set_propagate(envoy_config_route_v3_Decorator *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_Decorator_mutable_propagate(envoy_config_route_v3_Decorator* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_Decorator_propagate(msg); @@ -7476,7 +7520,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_Tracing_custom_tags_mutable_upb_arr UPB_INLINE void envoy_config_route_v3_Tracing_set_client_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_client_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_client_sampling(msg); @@ -7488,7 +7532,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing } UPB_INLINE void envoy_config_route_v3_Tracing_set_random_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_random_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_random_sampling(msg); @@ -7500,7 +7544,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing } UPB_INLINE void envoy_config_route_v3_Tracing_set_overall_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_overall_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_overall_sampling(msg); @@ -7624,7 +7668,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualCluster_headers_mutable_upb_ UPB_INLINE void envoy_config_route_v3_VirtualCluster_set_name(envoy_config_route_v3_VirtualCluster *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_VirtualCluster_mutable_headers(envoy_config_route_v3_VirtualCluster* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -7772,7 +7816,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_has_limit(const envoy_config_rou UPB_INLINE void envoy_config_route_v3_RateLimit_set_stage(envoy_config_route_v3_RateLimit *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_mutable_stage(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_stage(msg); @@ -7784,7 +7828,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_m } UPB_INLINE void envoy_config_route_v3_RateLimit_set_disable_key(envoy_config_route_v3_RateLimit *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RateLimit_Action** envoy_config_route_v3_RateLimit_mutable_actions(envoy_config_route_v3_RateLimit* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -7818,7 +7862,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_RateLimit_set_limit(envoy_config_route_v3_RateLimit *msg, envoy_config_route_v3_RateLimit_Override* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateLimit_mutable_limit(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Override* sub = (struct envoy_config_route_v3_RateLimit_Override*)envoy_config_route_v3_RateLimit_limit(msg); @@ -8063,7 +8107,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_query_parameter_value UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_source_cluster(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_SourceCluster* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_route_v3_RateLimit_Action_mutable_source_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_SourceCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_SourceCluster*)envoy_config_route_v3_RateLimit_Action_source_cluster(msg); @@ -8075,7 +8119,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_co } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_destination_cluster(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_DestinationCluster* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_config_route_v3_RateLimit_Action_mutable_destination_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_DestinationCluster*)envoy_config_route_v3_RateLimit_Action_destination_cluster(msg); @@ -8087,7 +8131,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* env } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_request_headers(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_RequestHeaders* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_route_v3_RateLimit_Action_mutable_request_headers(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* sub = (struct envoy_config_route_v3_RateLimit_Action_RequestHeaders*)envoy_config_route_v3_RateLimit_Action_request_headers(msg); @@ -8099,7 +8143,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_c } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_remote_address(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_RemoteAddress* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_RemoteAddress*)envoy_config_route_v3_RateLimit_Action_remote_address(msg); @@ -8111,7 +8155,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_co } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_generic_key(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_GenericKey* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route_v3_RateLimit_Action_mutable_generic_key(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_GenericKey* sub = (struct envoy_config_route_v3_RateLimit_Action_GenericKey*)envoy_config_route_v3_RateLimit_Action_generic_key(msg); @@ -8123,7 +8167,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_confi } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_header_value_match(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_header_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)envoy_config_route_v3_RateLimit_Action_header_value_match(msg); @@ -8135,7 +8179,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_dynamic_metadata(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_DynamicMetaData* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)envoy_config_route_v3_RateLimit_Action_dynamic_metadata(msg); @@ -8147,7 +8191,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_ } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_metadata(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_MetaData* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_mutable_metadata(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_MetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)envoy_config_route_v3_RateLimit_Action_metadata(msg); @@ -8159,7 +8203,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_ } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_extension(envoy_config_route_v3_RateLimit_Action *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RateLimit_Action_mutable_extension(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RateLimit_Action_extension(msg); @@ -8171,7 +8215,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_masked_remote_address(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_masked_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)envoy_config_route_v3_RateLimit_Action_masked_remote_address(msg); @@ -8183,7 +8227,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* en } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_query_parameter_value_match(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_query_parameter_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)envoy_config_route_v3_RateLimit_Action_query_parameter_value_match(msg); @@ -8345,15 +8389,15 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_RequestHeaders_skip_if_ab UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_header_name(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_skip_if_absent(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, bool value) { const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.RemoteAddress */ @@ -8465,7 +8509,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_has_v UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v4_prefix_mask_len(msg); @@ -8477,7 +8521,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_A } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v6_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v6_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v6_prefix_mask_len(msg); @@ -8551,11 +8595,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_GenericKey_desc UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_GenericKey *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_GenericKey *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.HeaderValueMatch */ @@ -8669,11 +8713,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_HeaderValueMatc UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_expect_match(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_expect_match(msg); @@ -8715,7 +8759,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Rat } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.DynamicMetaData */ @@ -8797,11 +8841,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_DynamicMetaData UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_metadata_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_DynamicMetaData_metadata_key(msg); @@ -8813,7 +8857,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_Rate } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_default_value(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.MetaData */ @@ -8919,11 +8963,11 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_MetaData_skip_if_absent(c UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_StringView value) { const upb_MiniTableField field = {1, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_metadata_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_MetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_MetaData* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_MetaData_metadata_key(msg); @@ -8935,15 +8979,15 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_Rate } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_default_value(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_source(envoy_config_route_v3_RateLimit_Action_MetaData *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_skip_if_absent(envoy_config_route_v3_RateLimit_Action_MetaData *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch */ @@ -9057,11 +9101,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_QueryParameterV UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_expect_match(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_expect_match(msg); @@ -9103,7 +9147,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Override */ @@ -9170,7 +9214,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Override_has_dynamic_metadata(co UPB_INLINE void envoy_config_route_v3_RateLimit_Override_set_dynamic_metadata(envoy_config_route_v3_RateLimit_Override *msg, envoy_config_route_v3_RateLimit_Override_DynamicMetadata* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_config_route_v3_RateLimit_Override_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Override* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* sub = (struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)envoy_config_route_v3_RateLimit_Override_dynamic_metadata(msg); @@ -9236,7 +9280,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Override_DynamicMetadata_has_met UPB_INLINE void envoy_config_route_v3_RateLimit_Override_DynamicMetadata_set_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_mutable_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Override_DynamicMetadata_metadata_key(msg); @@ -9466,15 +9510,15 @@ UPB_INLINE bool envoy_config_route_v3_HeaderMatcher_treat_missing_header_as_empt UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_name(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_exact_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_range_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_v3_Int64Range* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMatcher_mutable_range_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)envoy_config_route_v3_HeaderMatcher_range_match(msg); @@ -9486,23 +9530,23 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMatcher_ } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_present_match(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 24), -13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_invert_match(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_prefix_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_suffix_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_safe_regex_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {11, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_HeaderMatcher_mutable_safe_regex_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_HeaderMatcher_safe_regex_match(msg); @@ -9514,11 +9558,11 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_Head } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_contains_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_string_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {13, UPB_SIZE(20, 24), -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_HeaderMatcher_mutable_string_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_HeaderMatcher_string_match(msg); @@ -9530,7 +9574,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Hea } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_treat_missing_header_as_empty(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {14, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.QueryParameterMatcher */ @@ -9626,11 +9670,11 @@ UPB_INLINE bool envoy_config_route_v3_QueryParameterMatcher_has_present_match(co UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_name(envoy_config_route_v3_QueryParameterMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_string_match(envoy_config_route_v3_QueryParameterMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_QueryParameterMatcher_mutable_string_match(envoy_config_route_v3_QueryParameterMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_QueryParameterMatcher_string_match(msg); @@ -9642,7 +9686,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Que } UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_present_match(envoy_config_route_v3_QueryParameterMatcher *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 32), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.InternalRedirectPolicy */ @@ -9808,7 +9852,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_InternalRedirectPolicy_response_hea UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_InternalRedirectPolicy_mutable_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_InternalRedirectPolicy_max_internal_redirects(msg); @@ -9878,7 +9922,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_allow_cross_scheme_redirect(envoy_config_route_v3_InternalRedirectPolicy *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_route_v3_InternalRedirectPolicy_mutable_response_headers_to_copy(envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -9988,7 +10032,7 @@ UPB_INLINE bool envoy_config_route_v3_FilterConfig_disabled(const envoy_config_r UPB_INLINE void envoy_config_route_v3_FilterConfig_set_config(envoy_config_route_v3_FilterConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_mutable_config(envoy_config_route_v3_FilterConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterConfig_config(msg); @@ -10000,11 +10044,11 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_mutabl } UPB_INLINE void envoy_config_route_v3_FilterConfig_set_is_optional(envoy_config_route_v3_FilterConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_FilterConfig_set_disabled(envoy_config_route_v3_FilterConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c index 36a7112dde..c199b0c396 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c @@ -78,6 +78,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = { &envoy_config_route_v3_VirtualHost_submsgs[0], &envoy_config_route_v3_VirtualHost__fields[0], UPB_SIZE(104, 176), 22, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualHost", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -127,6 +130,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigE &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -145,6 +151,9 @@ const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = { &envoy_config_route_v3_FilterAction_submsgs[0], &envoy_config_route_v3_FilterAction__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.FilterAction", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RouteList_submsgs[1] = { @@ -159,6 +168,9 @@ const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = { &envoy_config_route_v3_RouteList_submsgs[0], &envoy_config_route_v3_RouteList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max192b}, @@ -205,6 +217,9 @@ const upb_MiniTable envoy__config__route__v3__Route_msg_init = { &envoy_config_route_v3_Route_submsgs[0], &envoy_config_route_v3_Route__fields[0], UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Route", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -254,6 +269,9 @@ const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_m &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Route.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -276,6 +294,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = { &envoy_config_route_v3_WeightedCluster_submsgs[0], &envoy_config_route_v3_WeightedCluster__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_prm_1bt_max128b}, @@ -313,6 +334,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0], UPB_SIZE(72, 120), 10, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster.ClusterWeight", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -346,6 +370,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__Ty &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -365,6 +392,9 @@ const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0], &envoy_config_route_v3_ClusterSpecifierPlugin__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ClusterSpecifierPlugin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -406,6 +436,9 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = { &envoy_config_route_v3_RouteMatch_submsgs[0], &envoy_config_route_v3_RouteMatch__fields[0], UPB_SIZE(56, 88), 13, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -430,6 +463,9 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_ NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.GrpcRouteMatchOptions", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = { @@ -446,38 +482,49 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0], &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.TlsContextMatchOptions", +#endif }; const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.ConnectMatcher", +#endif }; -static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[5] = { +static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[9] = { - {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[10] = { + {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(12, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {10, UPB_SIZE(20, 88), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { &envoy_config_route_v3_CorsPolicy_submsgs[0], &envoy_config_route_v3_CorsPolicy__fields[0], - UPB_SIZE(72, 120), 9, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(72, 128), 10, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.CorsPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -488,7 +535,7 @@ const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0070000c0901004a, &upb_pom_1bt_maxmaxb}, + {0x0078000c0901004a, &upb_pom_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x006000003f03005a, &upb_prm_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -566,6 +613,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = { &envoy_config_route_v3_RouteAction_submsgs[0], &envoy_config_route_v3_RouteAction__fields[0], UPB_SIZE(144, 248), 34, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003800200100000a, &upb_pos_1bt}, @@ -607,17 +657,21 @@ static const upb_MiniTableSub envoy_config_route_v3_RouteAction_RequestMirrorPol {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[4] = { - {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[5] = { + {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init = { &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0], - UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.RequestMirrorPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -625,7 +679,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_m {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003000003f00002a, &upb_pss_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000900003f000030, &upb_psb1_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -651,6 +705,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy__fields[0], 24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pom_1bt_max64b}, @@ -676,6 +733,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_ms &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.Header", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -691,6 +751,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAtt NULL, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -715,6 +778,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_ms &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.Cookie", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -735,6 +801,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Connectio NULL, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -749,6 +818,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryPara NULL, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -763,6 +835,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterSta NULL, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.FilterState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -784,6 +859,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_ini &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.UpgradeConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -803,6 +881,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__Connec &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -827,6 +908,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0], &envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.MaxStreamDuration", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_submsgs[10] = { @@ -862,6 +946,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = { &envoy_config_route_v3_RetryPolicy_submsgs[0], &envoy_config_route_v3_RetryPolicy__fields[0], UPB_SIZE(72, 128), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -895,6 +982,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_ini &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryPriority", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -916,6 +1006,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_ms &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryHostPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -938,6 +1031,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryBackOff", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = { @@ -949,6 +1045,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init NULL, &envoy_config_route_v3_RetryPolicy_ResetHeader__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.ResetHeader", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -971,6 +1070,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackO &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -992,6 +1094,9 @@ const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = { &envoy_config_route_v3_HedgePolicy_submsgs[0], &envoy_config_route_v3_HedgePolicy__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.HedgePolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1020,6 +1125,9 @@ const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = { &envoy_config_route_v3_RedirectAction_submsgs[0], &envoy_config_route_v3_RedirectAction__fields[0], UPB_SIZE(56, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RedirectAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x004000003f00000a, &upb_pss_1bt}, @@ -1053,6 +1161,9 @@ const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = { &envoy_config_route_v3_DirectResponseAction_submsgs[0], &envoy_config_route_v3_DirectResponseAction__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.DirectResponseAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -1063,6 +1174,9 @@ const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.NonForwardingAction", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_Decorator_submsgs[1] = { @@ -1078,6 +1192,9 @@ const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = { &envoy_config_route_v3_Decorator_submsgs[0], &envoy_config_route_v3_Decorator__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Decorator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1102,6 +1219,9 @@ const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = { &envoy_config_route_v3_Tracing_submsgs[0], &envoy_config_route_v3_Tracing__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Tracing", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1127,6 +1247,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = { &envoy_config_route_v3_VirtualCluster_submsgs[0], &envoy_config_route_v3_VirtualCluster__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1156,6 +1279,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = { &envoy_config_route_v3_RateLimit_submsgs[0], &envoy_config_route_v3_RateLimit__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1196,6 +1322,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init = { &envoy_config_route_v3_RateLimit_Action_submsgs[0], &envoy_config_route_v3_RateLimit_Action__fields[0], UPB_SIZE(16, 24), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -1220,12 +1349,18 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.SourceCluster", +#endif }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.DestinationCluster", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = { @@ -1238,6 +1373,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_ NULL, &envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.RequestHeaders", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1250,6 +1388,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.RemoteAddress", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = { @@ -1266,6 +1407,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAdd &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0], &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_GenericKey__fields[2] = { @@ -1277,6 +1421,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_ NULL, &envoy_config_route_v3_RateLimit_Action_GenericKey__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.GenericKey", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -1301,6 +1448,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatc &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0], &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.HeaderValueMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1327,6 +1477,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.DynamicMetaData", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1351,6 +1504,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_in &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.MetaData", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -1379,6 +1535,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterV &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0], &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1403,6 +1562,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = { &envoy_config_route_v3_RateLimit_Override_submsgs[0], &envoy_config_route_v3_RateLimit_Override__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Override", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -1421,6 +1583,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetada &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0], &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Override.DynamicMetadata", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_HeaderMatcher_submsgs[3] = { @@ -1447,6 +1612,9 @@ const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = { &envoy_config_route_v3_HeaderMatcher_submsgs[0], &envoy_config_route_v3_HeaderMatcher__fields[0], UPB_SIZE(40, 56), 11, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.HeaderMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002800003f00000a, &upb_pss_1bt}, @@ -1481,6 +1649,9 @@ const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = { &envoy_config_route_v3_QueryParameterMatcher_submsgs[0], &envoy_config_route_v3_QueryParameterMatcher__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.QueryParameterMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1510,6 +1681,9 @@ const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0], &envoy_config_route_v3_InternalRedirectPolicy__fields[0], UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.InternalRedirectPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1536,6 +1710,9 @@ const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = { &envoy_config_route_v3_FilterConfig_submsgs[0], &envoy_config_route_v3_FilterConfig__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.FilterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h index b50561505c..c64c2cf0d8 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h @@ -139,15 +139,15 @@ UPB_INLINE bool envoy_config_route_v3_ScopedRouteConfiguration_has_route_configu UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_name(envoy_config_route_v3_ScopedRouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configuration_name(envoy_config_route_v3_ScopedRouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_key(envoy_config_route_v3_ScopedRouteConfiguration *msg, envoy_config_route_v3_ScopedRouteConfiguration_Key* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_route_v3_ScopedRouteConfiguration_mutable_key(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_ScopedRouteConfiguration_Key* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key*)envoy_config_route_v3_ScopedRouteConfiguration_key(msg); @@ -159,11 +159,11 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_conf } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_on_demand(envoy_config_route_v3_ScopedRouteConfiguration *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configuration(envoy_config_route_v3_ScopedRouteConfiguration *msg, struct envoy_config_route_v3_RouteConfiguration* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_ScopedRouteConfiguration_mutable_route_configuration(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_config_route_v3_ScopedRouteConfiguration_route_configuration(msg); @@ -338,7 +338,7 @@ UPB_INLINE bool envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_has_ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_string_key(envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c index 430d498e4a..b9f67e87af 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c @@ -34,6 +34,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_ &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration.Key", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -72,6 +78,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fra NULL, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration.Key.Fragment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h index 41b57323bb..bc779097a5 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h @@ -164,7 +164,7 @@ UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match(const envoy_config_tap_v UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_MatchPredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match_config(msg); @@ -176,7 +176,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapCon } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_output_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_OutputConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_mutable_output_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_tap_v3_OutputConfig* sub = (struct envoy_config_tap_v3_OutputConfig*)envoy_config_tap_v3_TapConfig_output_config(msg); @@ -188,7 +188,7 @@ UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfi } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_tap_enabled(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_mutable_tap_enabled(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_tap_v3_TapConfig_tap_enabled(msg); @@ -200,7 +200,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ta } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_common_matcher_v3_MatchPredicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match(msg); @@ -428,7 +428,7 @@ UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_generic_bod UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_or_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_or_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_or_match(msg); @@ -440,7 +440,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_and_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_and_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_and_match(msg); @@ -452,7 +452,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_not_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_mutable_not_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_MatchPredicate_not_match(msg); @@ -464,11 +464,11 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchP } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_any_match(envoy_config_tap_v3_MatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_headers_match(msg); @@ -480,7 +480,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_headers_match(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(msg); @@ -822,7 +822,7 @@ UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_mutable UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -936,11 +936,11 @@ UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_bi UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.OutputConfig */ @@ -1088,7 +1088,7 @@ UPB_INLINE struct envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputConf } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(msg); @@ -1100,7 +1100,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_ } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(msg); @@ -1112,7 +1112,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_ } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_streaming(envoy_config_tap_v3_OutputConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.OutputSink */ @@ -1259,11 +1259,11 @@ UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_custom_sink(const envoy_confi UPB_INLINE void envoy_config_tap_v3_OutputSink_set_format(envoy_config_tap_v3_OutputSink *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingAdminSink* value) { const upb_MiniTableField field = {2, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_mutable_streaming_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_StreamingAdminSink* sub = (struct envoy_config_tap_v3_StreamingAdminSink*)envoy_config_tap_v3_OutputSink_streaming_admin(msg); @@ -1275,7 +1275,7 @@ UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_Ou } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_file_per_tap(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_FilePerTapSink* value) { const upb_MiniTableField field = {3, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_mutable_file_per_tap(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_FilePerTapSink* sub = (struct envoy_config_tap_v3_FilePerTapSink*)envoy_config_tap_v3_OutputSink_file_per_tap(msg); @@ -1287,7 +1287,7 @@ UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_Output } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_grpc(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingGrpcSink* value) { const upb_MiniTableField field = {4, 16, -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_mutable_streaming_grpc(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_StreamingGrpcSink* sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)envoy_config_tap_v3_OutputSink_streaming_grpc(msg); @@ -1299,7 +1299,7 @@ UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_Out } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_buffered_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_BufferedAdminSink* value) { const upb_MiniTableField field = {5, 16, -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_mutable_buffered_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_BufferedAdminSink* sub = (struct envoy_config_tap_v3_BufferedAdminSink*)envoy_config_tap_v3_OutputSink_buffered_admin(msg); @@ -1311,7 +1311,7 @@ UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_Out } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_custom_sink(envoy_config_tap_v3_OutputSink *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, 16, -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_tap_v3_OutputSink_mutable_custom_sink(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_tap_v3_OutputSink_custom_sink(msg); @@ -1427,11 +1427,11 @@ UPB_INLINE bool envoy_config_tap_v3_BufferedAdminSink_has_timeout(const envoy_co UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_max_traces(envoy_config_tap_v3_BufferedAdminSink *msg, uint64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_timeout(envoy_config_tap_v3_BufferedAdminSink *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_mutable_timeout(envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_tap_v3_BufferedAdminSink_timeout(msg); @@ -1493,7 +1493,7 @@ UPB_INLINE upb_StringView envoy_config_tap_v3_FilePerTapSink_path_prefix(const e UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_set_path_prefix(envoy_config_tap_v3_FilePerTapSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.StreamingGrpcSink */ @@ -1563,11 +1563,11 @@ UPB_INLINE bool envoy_config_tap_v3_StreamingGrpcSink_has_grpc_service(const env UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_tap_id(envoy_config_tap_v3_StreamingGrpcSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(envoy_config_tap_v3_StreamingGrpcSink *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_mutable_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_tap_v3_StreamingGrpcSink_grpc_service(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c index 10895584f6..47919d1629 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c @@ -41,6 +41,9 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = { &envoy_config_tap_v3_TapConfig_submsgs[0], &envoy_config_tap_v3_TapConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.TapConfig", +#endif }; static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_submsgs[9] = { @@ -72,6 +75,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = { &envoy_config_tap_v3_MatchPredicate_submsgs[0], &envoy_config_tap_v3_MatchPredicate__fields[0], UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.MatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -104,6 +110,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0], &envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.MatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -122,6 +131,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = { &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0], &envoy_config_tap_v3_HttpHeadersMatch__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpHeadersMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -141,6 +153,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = { &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0], &envoy_config_tap_v3_HttpGenericBodyMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpGenericBodyMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -158,6 +173,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat NULL, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -183,6 +201,9 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = { &envoy_config_tap_v3_OutputConfig_submsgs[0], &envoy_config_tap_v3_OutputConfig__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.OutputConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -216,6 +237,9 @@ const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = { &envoy_config_tap_v3_OutputSink_submsgs[0], &envoy_config_tap_v3_OutputSink__fields[0], 24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.OutputSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -232,6 +256,9 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.StreamingAdminSink", +#endif }; static const upb_MiniTableSub envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = { @@ -247,6 +274,9 @@ const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = { &envoy_config_tap_v3_BufferedAdminSink_submsgs[0], &envoy_config_tap_v3_BufferedAdminSink__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.BufferedAdminSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -261,6 +291,9 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = { NULL, &envoy_config_tap_v3_FilePerTapSink__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.FilePerTapSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -280,6 +313,9 @@ const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = { &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0], &envoy_config_tap_v3_StreamingGrpcSink__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.StreamingGrpcSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h index 593fcf9ece..ffc331ed49 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h @@ -12,6 +12,7 @@ #include "envoy/config/trace/v3/datadog.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" #include "udpa/annotations/migrate.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" @@ -24,10 +25,78 @@ extern "C" { #endif +typedef struct envoy_config_trace_v3_DatadogRemoteConfig { upb_Message UPB_PRIVATE(base); } envoy_config_trace_v3_DatadogRemoteConfig; typedef struct envoy_config_trace_v3_DatadogConfig { upb_Message UPB_PRIVATE(base); } envoy_config_trace_v3_DatadogConfig; +struct google_protobuf_Duration; +/* envoy.config.trace.v3.DatadogRemoteConfig */ + +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_new(upb_Arena* arena) { + return (envoy_config_trace_v3_DatadogRemoteConfig*)_upb_Message_New(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init, arena); +} +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_trace_v3_DatadogRemoteConfig* ret = envoy_config_trace_v3_DatadogRemoteConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_trace_v3_DatadogRemoteConfig* ret = envoy_config_trace_v3_DatadogRemoteConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_trace_v3_DatadogRemoteConfig_serialize(const envoy_config_trace_v3_DatadogRemoteConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_trace_v3_DatadogRemoteConfig_serialize_ex(const envoy_config_trace_v3_DatadogRemoteConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_trace_v3_DatadogRemoteConfig_clear_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_trace_v3_DatadogRemoteConfig_polling_interval(const envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_trace_v3_DatadogRemoteConfig_has_polling_interval(const envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_trace_v3_DatadogRemoteConfig_set_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_trace_v3_DatadogRemoteConfig_mutable_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_trace_v3_DatadogRemoteConfig_polling_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_trace_v3_DatadogRemoteConfig_set_polling_interval(msg, sub); + } + return sub; +} + /* envoy.config.trace.v3.DatadogConfig */ UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogConfig_new(upb_Arena* arena) { @@ -65,53 +134,81 @@ UPB_INLINE char* envoy_config_trace_v3_DatadogConfig_serialize_ex(const envoy_co return ptr; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_collector_cluster(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_collector_cluster(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_service_name(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_service_name(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_collector_hostname(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_collector_hostname(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_remote_config(envoy_config_trace_v3_DatadogConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogConfig_remote_config(const envoy_config_trace_v3_DatadogConfig* msg) { + const envoy_config_trace_v3_DatadogRemoteConfig* default_val = NULL; + const envoy_config_trace_v3_DatadogRemoteConfig* ret; + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_trace_v3_DatadogConfig_has_remote_config(const envoy_config_trace_v3_DatadogConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_cluster(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_service_name(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_hostname(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_remote_config(envoy_config_trace_v3_DatadogConfig *msg, envoy_config_trace_v3_DatadogRemoteConfig* value) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogConfig_mutable_remote_config(envoy_config_trace_v3_DatadogConfig* msg, upb_Arena* arena) { + struct envoy_config_trace_v3_DatadogRemoteConfig* sub = (struct envoy_config_trace_v3_DatadogRemoteConfig*)envoy_config_trace_v3_DatadogConfig_remote_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_trace_v3_DatadogRemoteConfig*)_upb_Message_New(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init, arena); + if (sub) envoy_config_trace_v3_DatadogConfig_set_remote_config(msg, sub); + } + return sub; } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c index 02294ca32f..03e5cb9995 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c @@ -8,6 +8,7 @@ #include #include "upb/generated_code_support.h" #include "envoy/config/trace/v3/datadog.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" #include "udpa/annotations/migrate.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" @@ -16,25 +17,51 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[3] = { - {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableSub envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +}; + +static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__fields[1] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = { + &envoy_config_trace_v3_DatadogRemoteConfig_submsgs[0], + &envoy_config_trace_v3_DatadogRemoteConfig__fields[0], + UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DatadogRemoteConfig", +#endif +}; + +static const upb_MiniTableSub envoy_config_trace_v3_DatadogConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init}, +}; + +static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = { - NULL, + &envoy_config_trace_v3_DatadogConfig_submsgs[0], &envoy_config_trace_v3_DatadogConfig__fields[0], - UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DatadogConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000800003f00000a, &upb_pss_1bt}, - {0x001800003f000012, &upb_pss_1bt}, - {0x002800003f00001a, &upb_pss_1bt}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x002000003f000012, &upb_pss_1bt}, + {0x003000003f00001a, &upb_pss_1bt}, }) }; -static const upb_MiniTable *messages_layout[1] = { +static const upb_MiniTable *messages_layout[2] = { + &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, &envoy__config__trace__v3__DatadogConfig_msg_init, }; @@ -42,7 +69,7 @@ const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout = { messages_layout, NULL, NULL, - 1, + 2, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h index 80622a1d9a..9378ae585d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h @@ -17,6 +17,7 @@ extern "C" { #endif +extern const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init; extern const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init; extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h index 5cda481b4f..6ba1fcd8b6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h @@ -98,11 +98,11 @@ UPB_INLINE bool envoy_config_trace_v3_DynamicOtConfig_has_config(const envoy_con UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_library(envoy_config_trace_v3_DynamicOtConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_config(envoy_config_trace_v3_DynamicOtConfig *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_mutable_config(envoy_config_trace_v3_DynamicOtConfig* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_DynamicOtConfig_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c index a67df9520d..d95d8121e7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = { &envoy_config_trace_v3_DynamicOtConfig_submsgs[0], &envoy_config_trace_v3_DynamicOtConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DynamicOtConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h index 9d07d0efa3..9aba7b2b75 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h @@ -85,7 +85,7 @@ UPB_INLINE bool envoy_config_trace_v3_Tracing_has_http(const envoy_config_trace_ UPB_INLINE void envoy_config_trace_v3_Tracing_set_http(envoy_config_trace_v3_Tracing *msg, envoy_config_trace_v3_Tracing_Http* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_mutable_http(envoy_config_trace_v3_Tracing* msg, upb_Arena* arena) { struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_config_trace_v3_Tracing_http(msg); @@ -172,11 +172,11 @@ UPB_INLINE bool envoy_config_trace_v3_Tracing_Http_has_typed_config(const envoy_ UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_name(envoy_config_trace_v3_Tracing_Http *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_typed_config(envoy_config_trace_v3_Tracing_Http *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutable_typed_config(envoy_config_trace_v3_Tracing_Http* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_trace_v3_Tracing_Http_typed_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c index 0d2b5009cb..c08fd77c02 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = { &envoy_config_trace_v3_Tracing_submsgs[0], &envoy_config_trace_v3_Tracing__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.Tracing", +#endif }; static const upb_MiniTableSub envoy_config_trace_v3_Tracing_Http_submsgs[1] = { @@ -43,6 +46,9 @@ const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = { &envoy_config_trace_v3_Tracing_Http_submsgs[0], &envoy_config_trace_v3_Tracing_Http__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.Tracing.Http", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h index f31fc6a64c..18101a2c5b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h @@ -149,11 +149,11 @@ UPB_INLINE bool envoy_config_trace_v3_LightstepConfig_has_access_token(const env UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_collector_cluster(envoy_config_trace_v3_LightstepConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_access_token_file(envoy_config_trace_v3_LightstepConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* envoy_config_trace_v3_LightstepConfig_mutable_propagation_modes(envoy_config_trace_v3_LightstepConfig* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -185,7 +185,7 @@ UPB_INLINE bool envoy_config_trace_v3_LightstepConfig_add_propagation_modes(envo } UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_access_token(envoy_config_trace_v3_LightstepConfig *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_LightstepConfig_mutable_access_token(envoy_config_trace_v3_LightstepConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_LightstepConfig_access_token(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c index 8dff01b7b0..b576427211 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = { &envoy_config_trace_v3_LightstepConfig_submsgs[0], &envoy_config_trace_v3_LightstepConfig__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.LightstepConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h index c5f6a060f7..4a83d6cb05 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h @@ -287,7 +287,7 @@ UPB_INLINE bool envoy_config_trace_v3_OpenCensusConfig_has_ocagent_grpc_service( UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_trace_config(envoy_config_trace_v3_OpenCensusConfig *msg, struct opencensus_proto_trace_v1_TraceConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trace_v3_OpenCensusConfig_mutable_trace_config(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_TraceConfig* sub = (struct opencensus_proto_trace_v1_TraceConfig*)envoy_config_trace_v3_OpenCensusConfig_trace_config(msg); @@ -299,23 +299,23 @@ UPB_INLINE struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trace_v3_O } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stdout_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_project_id(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_zipkin_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(18, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_zipkin_url(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* envoy_config_trace_v3_OpenCensusConfig_mutable_incoming_trace_context(envoy_config_trace_v3_OpenCensusConfig* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(20, 56), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -375,19 +375,19 @@ UPB_INLINE bool envoy_config_trace_v3_OpenCensusConfig_add_outgoing_trace_contex } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_address(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {11, UPB_SIZE(28, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_address(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(64, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_grpc_service(envoy_config_trace_v3_OpenCensusConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_stackdriver_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_stackdriver_grpc_service(msg); @@ -399,7 +399,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCe } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_grpc_service(envoy_config_trace_v3_OpenCensusConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_ocagent_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_ocagent_grpc_service(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c index 961aac1a06..e65603ed9f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c @@ -44,6 +44,9 @@ const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = { &envoy_config_trace_v3_OpenCensusConfig_submsgs[0], &envoy_config_trace_v3_OpenCensusConfig__fields[0], UPB_SIZE(72, 120), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.OpenCensusConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h index 34b044dfbb..9a5c96a42d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h @@ -163,7 +163,7 @@ UPB_INLINE bool envoy_config_trace_v3_OpenTelemetryConfig_has_sampler(const envo UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenTelemetryConfig_mutable_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenTelemetryConfig_grpc_service(msg); @@ -175,11 +175,11 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenTe } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_service_name(envoy_config_trace_v3_OpenTelemetryConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_http_service(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_HttpService* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpService* envoy_config_trace_v3_OpenTelemetryConfig_mutable_http_service(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpService* sub = (struct envoy_config_core_v3_HttpService*)envoy_config_trace_v3_OpenTelemetryConfig_http_service(msg); @@ -221,7 +221,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_ } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_sampler(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_v3_OpenTelemetryConfig_mutable_sampler(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_trace_v3_OpenTelemetryConfig_sampler(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c index d956ad7816..444bd1e530 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = { &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0], &envoy_config_trace_v3_OpenTelemetryConfig__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.OpenTelemetryConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h index 30db46de9d..a113d9e8a7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h @@ -84,7 +84,7 @@ UPB_INLINE bool envoy_config_trace_v3_TraceServiceConfig_has_grpc_service(const UPB_INLINE void envoy_config_trace_v3_TraceServiceConfig_set_grpc_service(envoy_config_trace_v3_TraceServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_TraceServiceConfig_mutable_grpc_service(envoy_config_trace_v3_TraceServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_TraceServiceConfig_grpc_service(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c index 37ef6dba26..adf7dc4768 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = { &envoy_config_trace_v3_TraceServiceConfig_submsgs[0], &envoy_config_trace_v3_TraceServiceConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.TraceServiceConfig", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h index 5a42fccf1d..b0a32fd324 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h @@ -104,7 +104,7 @@ UPB_INLINE bool envoy_config_trace_v3_SkyWalkingConfig_has_client_config(const e UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_grpc_service(envoy_config_trace_v3_SkyWalkingConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_SkyWalkingConfig_mutable_grpc_service(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_SkyWalkingConfig_grpc_service(msg); @@ -116,7 +116,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_SkyWal } UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_client_config(envoy_config_trace_v3_SkyWalkingConfig *msg, envoy_config_trace_v3_ClientConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_SkyWalkingConfig_mutable_client_config(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) { struct envoy_config_trace_v3_ClientConfig* sub = (struct envoy_config_trace_v3_ClientConfig*)envoy_config_trace_v3_SkyWalkingConfig_client_config(msg); @@ -231,19 +231,19 @@ UPB_INLINE bool envoy_config_trace_v3_ClientConfig_has_max_cache_size(const envo UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_service_name(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_instance_name(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_backend_token(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_max_cache_size(envoy_config_trace_v3_ClientConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_trace_v3_ClientConfig_mutable_max_cache_size(envoy_config_trace_v3_ClientConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_trace_v3_ClientConfig_max_cache_size(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c index 1f4cd9e40f..6d84e720d8 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = { &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0], &envoy_config_trace_v3_SkyWalkingConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.SkyWalkingConfig", +#endif }; static const upb_MiniTableSub envoy_config_trace_v3_ClientConfig_submsgs[1] = { @@ -49,6 +52,9 @@ const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = { &envoy_config_trace_v3_ClientConfig_submsgs[0], &envoy_config_trace_v3_ClientConfig__fields[0], UPB_SIZE(48, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.ClientConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h index 2c18ac8663..a668349402 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h @@ -134,7 +134,7 @@ UPB_INLINE bool envoy_config_trace_v3_XRayConfig_has_segment_fields(const envoy_ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_daemon_endpoint(envoy_config_trace_v3_XRayConfig *msg, struct envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v3_XRayConfig_mutable_daemon_endpoint(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_trace_v3_XRayConfig_daemon_endpoint(msg); @@ -146,11 +146,11 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v3_XRay } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_name(envoy_config_trace_v3_XRayConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_sampling_rule_manifest(envoy_config_trace_v3_XRayConfig *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_XRayConfig_mutable_sampling_rule_manifest(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_XRayConfig_sampling_rule_manifest(msg); @@ -162,7 +162,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_XRayCon } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_fields(envoy_config_trace_v3_XRayConfig *msg, envoy_config_trace_v3_XRayConfig_SegmentFields* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3_XRayConfig_mutable_segment_fields(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_trace_v3_XRayConfig_SegmentFields* sub = (struct envoy_config_trace_v3_XRayConfig_SegmentFields*)envoy_config_trace_v3_XRayConfig_segment_fields(msg); @@ -240,11 +240,11 @@ UPB_INLINE bool envoy_config_trace_v3_XRayConfig_SegmentFields_has_aws(const env UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_origin(envoy_config_trace_v3_XRayConfig_SegmentFields *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_aws(envoy_config_trace_v3_XRayConfig_SegmentFields *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig_SegmentFields_mutable_aws(envoy_config_trace_v3_XRayConfig_SegmentFields* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_XRayConfig_SegmentFields_aws(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c index 30cac96327..cae473d198 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = { &envoy_config_trace_v3_XRayConfig_submsgs[0], &envoy_config_trace_v3_XRayConfig__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.XRayConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -57,6 +60,9 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init &envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[0], &envoy_config_trace_v3_XRayConfig_SegmentFields__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.XRayConfig.SegmentFields", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h index 07fdc17bdb..0ac4e4daea 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h @@ -165,19 +165,19 @@ UPB_INLINE bool envoy_config_trace_v3_ZipkinConfig_split_spans_for_request(const UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_cluster(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_endpoint(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_trace_id_128bit(envoy_config_trace_v3_ZipkinConfig *msg, bool value) { const upb_MiniTableField field = {3, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_shared_span_context(envoy_config_trace_v3_ZipkinConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinConfig_mutable_shared_span_context(envoy_config_trace_v3_ZipkinConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_trace_v3_ZipkinConfig_shared_span_context(msg); @@ -189,15 +189,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinConfig_ } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_endpoint_version(envoy_config_trace_v3_ZipkinConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_hostname(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_split_spans_for_request(envoy_config_trace_v3_ZipkinConfig *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c index 9a43e30786..36576c7d00 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = { &envoy_config_trace_v3_ZipkinConfig_submsgs[0], &envoy_config_trace_v3_ZipkinConfig__fields[0], UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.ZipkinConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h index 0434315f76..2fd2340611 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h @@ -164,7 +164,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_connection_propert UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(msg); @@ -176,7 +176,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_ } UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_ConnectionProperties* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ConnectionProperties* sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(msg); @@ -286,7 +286,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_response(const en UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(msg); @@ -298,11 +298,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_ } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPRequestProperties* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_HTTPRequestProperties* sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_request(msg); @@ -314,7 +314,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_acce } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPResponseProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_HTTPResponseProperties* sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_response(msg); @@ -388,11 +388,11 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_sent_bytes(cons UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_received_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.AccessLogCommon */ @@ -932,11 +932,11 @@ UPB_INLINE int32_t envoy_data_accesslog_v3_AccessLogCommon_access_log_type(const UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_sample_rate(envoy_data_accesslog_v3_AccessLogCommon *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(104, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(msg); @@ -948,7 +948,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(msg); @@ -960,7 +960,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_TLSProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_mutable_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties*)envoy_data_accesslog_v3_AccessLogCommon_tls_properties(msg); @@ -972,7 +972,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3 } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_start_time(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_mutable_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_data_accesslog_v3_AccessLogCommon_start_time(msg); @@ -984,7 +984,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(msg); @@ -996,7 +996,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(msg); @@ -1020,7 +1020,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(msg); @@ -1032,7 +1032,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 96), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(msg); @@ -1044,7 +1044,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 104), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(msg); @@ -1056,7 +1056,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 112), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(msg); @@ -1068,7 +1068,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {13, UPB_SIZE(56, 120), 75, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(msg); @@ -1080,7 +1080,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 128), 76, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(msg); @@ -1092,11 +1092,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {15, UPB_SIZE(112, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_ResponseFlags* value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 152), 77, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_mutable_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ResponseFlags* sub = (struct envoy_data_accesslog_v3_ResponseFlags*)envoy_data_accesslog_v3_AccessLogCommon_response_flags(msg); @@ -1108,7 +1108,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3 } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_metadata(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 160), 78, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_mutable_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_data_accesslog_v3_AccessLogCommon_metadata(msg); @@ -1120,15 +1120,15 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessL } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {18, UPB_SIZE(120, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_route_name(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {19, UPB_SIZE(128, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {20, UPB_SIZE(72, 200), 79, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(msg); @@ -1190,7 +1190,7 @@ UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_a } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_duration(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {23, UPB_SIZE(84, 224), 80, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_duration(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_duration(msg); @@ -1202,43 +1202,43 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon *msg, uint32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(88, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {25, UPB_SIZE(136, 232), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_stream_id(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {26, UPB_SIZE(144, 248), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {28, UPB_SIZE(152, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {29, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {30, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {31, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {32, UPB_SIZE(184, 304), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_access_log_type(envoy_data_accesslog_v3_AccessLogCommon *msg, int32_t value) { const upb_MiniTableField field = {33, UPB_SIZE(96, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry */ @@ -1643,58 +1643,70 @@ UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_dns_resolution_failure(con &default_val, &ret); return ret; } +UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags* msg) { + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_remote_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {2, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {3, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_local_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {5, 13, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {6, 14, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {7, 15, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {8, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_route_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {9, 17, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_delay_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {10, 18, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_fault_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {11, 19, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limited(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {12, 20, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags *msg, envoy_data_accesslog_v3_ResponseFlags_Unauthorized* value) { const upb_MiniTableField field = {13, UPB_SIZE(24, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_mutable_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(msg); @@ -1706,59 +1718,63 @@ UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {16, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {20, UPB_SIZE(34, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(35, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(36, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_duration_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(37, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {24, UPB_SIZE(38, 31), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(39, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_overload_manager(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(40, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(41, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.ResponseFlags.Unauthorized */ @@ -1812,7 +1828,7 @@ UPB_INLINE int32_t envoy_data_accesslog_v3_ResponseFlags_Unauthorized_reason(con UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_set_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties */ @@ -1950,11 +1966,11 @@ UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_ja3_fingerprint( UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_version(envoy_data_accesslog_v3_TLSProperties *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_mutable_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(msg); @@ -1966,11 +1982,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProper } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(msg); @@ -1982,7 +1998,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* e } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(msg); @@ -1994,11 +2010,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* e } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_session_id(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties.CertificateProperties */ @@ -2126,11 +2142,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Su } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_issuer(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName */ @@ -2214,11 +2230,11 @@ UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Subj UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPRequestProperties */ @@ -2461,19 +2477,19 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_downstream_hea UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_method(envoy_data_accesslog_v3_HTTPRequestProperties *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_scheme(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_authority(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_port(envoy_data_accesslog_v3_HTTPRequestProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_mutable_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPRequestProperties_port(msg); @@ -2485,35 +2501,35 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPReque } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_referer(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(64, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_id(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(72, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_original_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(80, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {11, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {12, UPB_SIZE(96, 160), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_clear(envoy_data_accesslog_v3_HTTPRequestProperties* msg) { const upb_MiniTableField field = {13, UPB_SIZE(20, 168), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2542,11 +2558,11 @@ UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* en } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {14, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {15, UPB_SIZE(112, 184), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry */ @@ -2739,7 +2755,7 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_downstream_he UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(envoy_data_accesslog_v3_HTTPResponseProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_mutable_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPResponseProperties_response_code(msg); @@ -2751,11 +2767,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRespo } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2809,15 +2825,15 @@ UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {8, UPB_SIZE(56, 80), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c index d3c5c2b1b9..f4aeac90a7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = { &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0], &envoy_data_accesslog_v3_TCPAccessLogEntry__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TCPAccessLogEntry", +#endif }; static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = { @@ -55,6 +58,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = { &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0], &envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPAccessLogEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -72,6 +78,9 @@ const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init = NULL, &envoy_data_accesslog_v3_ConnectionProperties__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ConnectionProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -142,6 +151,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = { &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0], &envoy_data_accesslog_v3_AccessLogCommon__fields[0], UPB_SIZE(192, 312), 33, kUpb_ExtMode_NonExtendable, 33, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f000009, &upb_psf8_1bt}, @@ -191,6 +203,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObje &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0], &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -206,6 +221,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry NULL, &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -218,7 +236,7 @@ static const upb_MiniTableSub envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init}, }; -static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27] = { +static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[28] = { {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {3, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -246,12 +264,16 @@ static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27 {25, UPB_SIZE(39, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(40, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {27, UPB_SIZE(41, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { &envoy_data_accesslog_v3_ResponseFlags_submsgs[0], &envoy_data_accesslog_v3_ResponseFlags__fields[0], - 48, 27, kUpb_ExtMode_NonExtendable, 27, UPB_FASTTABLE_MASK(248), 0, + 48, 28, kUpb_ExtMode_NonExtendable, 28, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ResponseFlags", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -281,7 +303,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { {0x002000003f0001c8, &upb_psb1_2bt}, {0x002100003f0001d0, &upb_psb1_2bt}, {0x002200003f0001d8, &upb_psb1_2bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x002300003f0001e0, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -296,6 +318,9 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_ NULL, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ResponseFlags.Unauthorized", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -322,6 +347,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = { &envoy_data_accesslog_v3_TLSProperties_submsgs[0], &envoy_data_accesslog_v3_TLSProperties__fields[0], UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -348,6 +376,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0], &envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties.CertificateProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -365,6 +396,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper NULL, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -400,6 +434,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0], &envoy_data_accesslog_v3_HTTPRequestProperties__fields[0], UPB_SIZE(120, 192), 15, kUpb_ExtMode_NonExtendable, 15, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPRequestProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -429,6 +466,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHe NULL, &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -458,6 +498,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0], &envoy_data_accesslog_v3_HTTPResponseProperties__fields[0], UPB_SIZE(64, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -487,6 +530,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response NULL, &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -504,6 +550,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response NULL, &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c index 3d5382bd80..8f929ddb53 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__extensions__clusters__aggregate__v3__ClusterConfig_ms NULL, &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.clusters.aggregate.v3.ClusterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h index 41613aa67f..f48a3c58f4 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h @@ -136,7 +136,7 @@ UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_d UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(msg); @@ -148,7 +148,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_faul } UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(msg); @@ -160,7 +160,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_comm } UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) { struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(msg); @@ -306,7 +306,7 @@ UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_head UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) { struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(msg); @@ -318,7 +318,7 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedL } UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(msg); @@ -330,7 +330,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_comm } UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) { struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(msg); @@ -392,7 +392,7 @@ UPB_INLINE uint64_t envoy_extensions_filters_common_fault_v3_FaultRateLimit_Fixe UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_set_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c index 693c0e1fc2..98bd93d83a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_ms &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultDelay", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__H NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { @@ -67,6 +73,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -83,6 +92,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi NULL, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -93,6 +105,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit", +#endif }; static const upb_MiniTable *messages_layout[5] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h index 934aeab037..94cf90be88 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h @@ -154,11 +154,11 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_grpc_statu UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(msg); @@ -170,7 +170,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http } UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(msg); @@ -182,7 +182,7 @@ UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* } UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort */ @@ -514,7 +514,7 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_filter_meta UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultDelay* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_delay(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct envoy_extensions_filters_common_fault_v3_FaultDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)envoy_extensions_filters_http_fault_v3_HTTPFault_delay(msg); @@ -526,7 +526,7 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_ext } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, envoy_extensions_filters_http_fault_v3_FaultAbort* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_abort(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_fault_v3_FaultAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)envoy_extensions_filters_http_fault_v3_HTTPFault_abort(msg); @@ -538,7 +538,7 @@ UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_exten } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -600,7 +600,7 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_add_downstream_ } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fau } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(msg); @@ -624,39 +624,39 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(52, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(60, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(68, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(76, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(84, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {13, UPB_SIZE(92, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(100, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(36, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {16, UPB_SIZE(40, 192), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c index 2c9f17db17..8b9cb2b986 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_ &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0], &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.FaultAbort", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__Hea NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = { @@ -86,6 +92,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_i &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0], &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0], UPB_SIZE(112, 200), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.HTTPFault", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h new file mode 100644 index 0000000000..d98d03a9c1 --- /dev/null +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h @@ -0,0 +1,431 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ + +#include "upb/generated_code_support.h" + +#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h" + +#include "envoy/config/core/v3/base.upb_minitable.h" +#include "envoy/config/core/v3/http_uri.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" +#include "google/protobuf/wrappers.upb_minitable.h" +#include "envoy/annotations/deprecation.upb_minitable.h" +#include "udpa/annotations/status.upb_minitable.h" +#include "validate/validate.upb_minitable.h" + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig { upb_Message UPB_PRIVATE(base); } envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig; +typedef struct envoy_extensions_filters_http_gcp_authn_v3_Audience { upb_Message UPB_PRIVATE(base); } envoy_extensions_filters_http_gcp_authn_v3_Audience; +typedef struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig { upb_Message UPB_PRIVATE(base); } envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig; +typedef struct envoy_extensions_filters_http_gcp_authn_v3_TokenHeader { upb_Message UPB_PRIVATE(base); } envoy_extensions_filters_http_gcp_authn_v3_TokenHeader; +struct envoy_config_core_v3_HttpUri; +struct envoy_config_core_v3_RetryPolicy; +struct google_protobuf_Duration; +struct google_protobuf_UInt64Value; + + + +/* envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig */ + +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_new(upb_Arena* arena) { + return (envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, arena); +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* ret = envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* ret = envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_serialize(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_serialize_ex(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_http_uri(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_HttpUri* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_http_uri(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const struct envoy_config_core_v3_HttpUri* default_val = NULL; + const struct envoy_config_core_v3_HttpUri* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_has_http_uri(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_retry_policy(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_retry_policy(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const struct envoy_config_core_v3_RetryPolicy* default_val = NULL; + const struct envoy_config_core_v3_RetryPolicy* ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_has_retry_policy(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_cache_config(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_cache_config(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* default_val = NULL; + const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_has_cache_config(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_token_header(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_token_header(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* default_val = NULL; + const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* ret; + const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_has_token_header(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_cluster(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_cluster(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_clear_timeout(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_timeout(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_has_timeout(const envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_http_uri(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, struct envoy_config_core_v3_HttpUri* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_mutable_http_uri(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena) { + struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_http_uri(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_HttpUri*)_upb_Message_New(&envoy__config__core__v3__HttpUri_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_http_uri(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_retry_policy(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, struct envoy_config_core_v3_RetryPolicy* value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_mutable_retry_policy(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena) { + struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_retry_policy(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_retry_policy(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_cache_config(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_mutable_cache_config(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena) { + struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* sub = (struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig*)envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_cache_config(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_cache_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_token_header(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* value) { + const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_mutable_token_header(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena) { + struct envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* sub = (struct envoy_extensions_filters_http_gcp_authn_v3_TokenHeader*)envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_token_header(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_http_gcp_authn_v3_TokenHeader*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_token_header(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_cluster(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, upb_StringView value) { + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_timeout(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_mutable_timeout(envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_set_timeout(msg, sub); + } + return sub; +} + +/* envoy.extensions.filters.http.gcp_authn.v3.Audience */ + +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_Audience* envoy_extensions_filters_http_gcp_authn_v3_Audience_new(upb_Arena* arena) { + return (envoy_extensions_filters_http_gcp_authn_v3_Audience*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, arena); +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_Audience* envoy_extensions_filters_http_gcp_authn_v3_Audience_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_Audience* ret = envoy_extensions_filters_http_gcp_authn_v3_Audience_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_Audience* envoy_extensions_filters_http_gcp_authn_v3_Audience_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_Audience* ret = envoy_extensions_filters_http_gcp_authn_v3_Audience_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_Audience_serialize(const envoy_extensions_filters_http_gcp_authn_v3_Audience* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_Audience_serialize_ex(const envoy_extensions_filters_http_gcp_authn_v3_Audience* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_Audience_clear_url(envoy_extensions_filters_http_gcp_authn_v3_Audience* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_gcp_authn_v3_Audience_url(const envoy_extensions_filters_http_gcp_authn_v3_Audience* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_Audience_set_url(envoy_extensions_filters_http_gcp_authn_v3_Audience *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.extensions.filters.http.gcp_authn.v3.TokenCacheConfig */ + +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_new(upb_Arena* arena) { + return (envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, arena); +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* ret = envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* ret = envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_serialize(const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_serialize_ex(const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_clear_cache_size(envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_cache_size(const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg) { + const struct google_protobuf_UInt64Value* default_val = NULL; + const struct google_protobuf_UInt64Value* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_has_cache_size(const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_set_cache_size(envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig *msg, struct google_protobuf_UInt64Value* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_mutable_cache_size(envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* msg, upb_Arena* arena) { + struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_cache_size(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena); + if (sub) envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_set_cache_size(msg, sub); + } + return sub; +} + +/* envoy.extensions.filters.http.gcp_authn.v3.TokenHeader */ + +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_new(upb_Arena* arena) { + return (envoy_extensions_filters_http_gcp_authn_v3_TokenHeader*)_upb_Message_New(&envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, arena); +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* ret = envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* ret = envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_serialize(const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_serialize_ex(const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_clear_name(envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_name(const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_clear_value_prefix(envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_value_prefix(const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_set_name(envoy_extensions_filters_http_gcp_authn_v3_TokenHeader *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_set_value_prefix(envoy_extensions_filters_http_gcp_authn_v3_TokenHeader *msg, upb_StringView value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c new file mode 100644 index 0000000000..c81951d563 --- /dev/null +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c @@ -0,0 +1,129 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include +#include "upb/generated_code_support.h" +#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h" +#include "envoy/config/core/v3/base.upb_minitable.h" +#include "envoy/config/core/v3/http_uri.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" +#include "google/protobuf/wrappers.upb_minitable.h" +#include "envoy/annotations/deprecation.upb_minitable.h" +#include "udpa/annotations/status.upb_minitable.h" +#include "validate/validate.upb_minitable.h" + +// Must be last. +#include "upb/port/def.inc" + +static const upb_MiniTableSub envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +}; + +static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__fields[6] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init = { + &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[0], + &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__fields[0], + UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003000003f00002a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_Audience__fields[1] = { + {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init = { + NULL, + &envoy_extensions_filters_http_gcp_authn_v3_Audience__fields[0], + UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.gcp_authn.v3.Audience", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f00000a, &upb_pss_1bt}, + }) +}; + +static const upb_MiniTableSub envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +}; + +static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__fields[1] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init = { + &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[0], + &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__fields[0], + UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.gcp_authn.v3.TokenCacheConfig", +#endif +}; + +static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_TokenHeader__fields[2] = { + {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init = { + NULL, + &envoy_extensions_filters_http_gcp_authn_v3_TokenHeader__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.gcp_authn.v3.TokenHeader", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f00000a, &upb_pss_1bt}, + {0x001800003f000012, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTable *messages_layout[4] = { + &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init, + &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init, + &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init, + &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init, +}; + +const upb_MiniTableFile envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upb_file_layout = { + messages_layout, + NULL, + NULL, + 4, + 0, + 0, +}; + +#include "upb/port/undef.inc" + diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h new file mode 100644 index 0000000000..ae92576dbb --- /dev/null +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h @@ -0,0 +1,33 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ + +#include "upb/generated_code_support.h" + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +extern const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init; +extern const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init; +extern const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init; +extern const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init; + +extern const upb_MiniTableFile envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upb_file_layout; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h index 968fa258ea..3f09a91552 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h @@ -102,13 +102,13 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_rules(cons return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -145,10 +145,34 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_matcher(co const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_track_per_rule_stats(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_track_per_rule_stats(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_rules(msg); @@ -160,7 +184,7 @@ UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_ } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(msg); @@ -171,12 +195,12 @@ UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_ return sub; } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_matcher(msg); @@ -188,7 +212,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rba } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(msg); @@ -198,6 +222,14 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rba } return sub; } +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_track_per_rule_stats(envoy_extensions_filters_http_rbac_v3_RBAC *msg, bool value) { + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.filters.http.rbac.v3.RBACPerRoute */ @@ -254,7 +286,7 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBACPerRoute_has_rbac(cons UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute *msg, envoy_extensions_filters_http_rbac_v3_RBAC* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_mutable_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_rbac_v3_RBAC* sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c index 2f2dcd5ebb..279415bcf1 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c @@ -25,23 +25,32 @@ static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBAC_submsgs {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, }; -static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[5] = { +static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[7] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = { &envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[0], &envoy_extensions_filters_http_rbac_v3_RBAC__fields[0], - UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.rbac.v3.RBAC", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00001a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x004000003f000032, &upb_pss_1bt}, + {0x000900003f000038, &upb_psb1_1bt}, }) }; @@ -57,6 +66,9 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0], &envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.rbac.v3.RBACPerRoute", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h index ec1f7ec36c..f5035e0e39 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h @@ -252,7 +252,7 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_has_upstream_log_ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_dynamic_stats(envoy_extensions_filters_http_router_v3_Router *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_http_router_v3_Router_mutable_dynamic_stats(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_http_router_v3_Router_dynamic_stats(msg); @@ -264,7 +264,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_http_route } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_start_child_span(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_http_router_v3_Router_mutable_upstream_log(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -298,7 +298,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_ } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_envoy_headers(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_extensions_filters_http_router_v3_Router_mutable_strict_check_headers(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -330,11 +330,11 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_add_strict_check_ } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_respect_expected_rq_timeout(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_grpc_request_failure_code_stats(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(33, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_http_router_v3_Router_mutable_upstream_http_filters(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -368,7 +368,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_upstream_log_options(envoy_extensions_filters_http_router_v3_Router *msg, envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 48), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* envoy_extensions_filters_http_router_v3_Router_mutable_upstream_log_options(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* sub = (struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)envoy_extensions_filters_http_router_v3_Router_upstream_log_options(msg); @@ -446,11 +446,11 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLog UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_set_flush_upstream_log_on_upstream_stream(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_set_upstream_log_flush_interval(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_mutable_upstream_log_flush_interval(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_upstream_log_flush_interval(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c index 14ba0fcfeb..d778168144 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c @@ -43,6 +43,9 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_ini &envoy_extensions_filters_http_router_v3_Router_submsgs[0], &envoy_extensions_filters_http_router_v3_Router__fields[0], UPB_SIZE(48, 56), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.router.v3.Router", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -76,6 +79,9 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__Upstre &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0], &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.router.v3.Router.UpstreamAccessLogOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h index 83624a21af..09b9e6aedb 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h @@ -96,7 +96,7 @@ UPB_INLINE bool envoy_extensions_filters_http_stateful_session_v3_StatefulSessio UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSession_set_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_mutable_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_http_stateful_session_v3_StatefulSession_session_state(msg); @@ -108,7 +108,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSession_set_strict(envoy_extensions_filters_http_stateful_session_v3_StatefulSession *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.http.stateful_session.v3.StatefulSessionPerRoute */ @@ -192,11 +192,11 @@ UPB_INLINE bool envoy_extensions_filters_http_stateful_session_v3_StatefulSessio UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_set_disabled(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute *msg, bool value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_set_stateful_session(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute *msg, envoy_extensions_filters_http_stateful_session_v3_StatefulSession* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_mutable_stateful_session(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* sub = (struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_stateful_session(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c index ec93068572..2f462758e0 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0], &envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.stateful_session.v3.StatefulSession", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0], &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.stateful_session.v3.StatefulSessionPerRoute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pob1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h index fa8fdd11bb..7ed0360530 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h @@ -167,7 +167,7 @@ typedef enum { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_NOT_SET = 0 } envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases; UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -176,7 +176,7 @@ typedef enum { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_NOT_SET = 0 } envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases; UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -193,47 +193,47 @@ UPB_INLINE int32_t envoy_extensions_filters_network_http_connection_manager_v3_H return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_stat_prefix(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stat_prefix(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { const envoy_extensions_filters_network_http_connection_manager_v3_Rds* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_Rds* ret; - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { const struct envoy_config_route_v3_RouteConfiguration* default_val = NULL; const struct envoy_config_route_v3_RouteConfiguration* ret; - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -333,13 +333,13 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_server_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_server_name(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -501,13 +501,13 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_via(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_via(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -641,19 +641,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* ret; - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_preserve_external_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -797,19 +797,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_strip_any_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_any_host_port(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_strip_any_host_port(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -1052,18 +1052,30 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http const upb_MiniTableField field = {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_append_local_overload(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_append_local_overload(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_codec_type(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stat_prefix(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_Rds* value) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_Rds*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(msg); @@ -1074,8 +1086,8 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rd return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_route_v3_RouteConfiguration* value) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(msg); @@ -1117,7 +1129,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_user_agent(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 88), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_user_agent(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_user_agent(msg); @@ -1129,7 +1141,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_tracing(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_tracing(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_tracing(msg); @@ -1141,7 +1153,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 104), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_protocol_options(msg); @@ -1153,7 +1165,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http2_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 112), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http2_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http2_protocol_options(msg); @@ -1164,12 +1176,12 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_fi return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_server_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_drain_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(36, 136), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_drain_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_drain_timeout(msg); @@ -1211,7 +1223,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_use_remote_address(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 152), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_use_remote_address(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_use_remote_address(msg); @@ -1223,7 +1235,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_generate_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {15, UPB_SIZE(48, 160), 70, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_generate_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_generate_request_id(msg); @@ -1235,11 +1247,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_forward_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {16, UPB_SIZE(52, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_set_current_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* value) { const upb_MiniTableField field = {17, UPB_SIZE(56, 168), 71, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_set_current_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_current_client_cert_details(msg); @@ -1251,23 +1263,23 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_proxy_100_continue(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(60, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_xff_num_trusted_hops(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, uint32_t value) { const upb_MiniTableField field = {19, UPB_SIZE(64, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_represent_ipv4_remote_address_as_ipv4_mapped_ipv6(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {20, UPB_SIZE(68, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_skip_xff_append(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(69, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_via(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_upgrade_configs(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {23, UPB_SIZE(72, 192), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1301,7 +1313,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_idle_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(76, 200), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_idle_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_idle_timeout(msg); @@ -1313,7 +1325,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_internal_address_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* value) { const upb_MiniTableField field = {25, UPB_SIZE(80, 208), 73, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_internal_address_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_internal_address_config(msg); @@ -1325,7 +1337,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_delayed_close_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {26, UPB_SIZE(84, 216), 74, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_delayed_close_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_delayed_close_timeout(msg); @@ -1337,7 +1349,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {28, UPB_SIZE(88, 224), 75, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_timeout(msg); @@ -1349,7 +1361,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_max_request_headers_kb(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {29, UPB_SIZE(92, 232), 76, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_max_request_headers_kb(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_max_request_headers_kb(msg); @@ -1361,7 +1373,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_normalize_path(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {30, UPB_SIZE(96, 240), 77, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_normalize_path(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_normalize_path(msg); @@ -1372,8 +1384,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* value) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(msg); @@ -1385,19 +1397,19 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_preserve_external_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {32, UPB_SIZE(104, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_merge_slashes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {33, UPB_SIZE(105, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_server_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {34, UPB_SIZE(108, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_common_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {35, UPB_SIZE(112, 248), 78, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_common_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_common_http_protocol_options(msg); @@ -1409,7 +1421,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_fil } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_id_extension(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* value) { const upb_MiniTableField field = {36, UPB_SIZE(116, 256), 79, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_id_extension(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_id_extension(msg); @@ -1421,11 +1433,11 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Re } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_always_set_request_id_in_response(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {37, UPB_SIZE(120, 44), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_local_reply_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* value) { const upb_MiniTableField field = {38, UPB_SIZE(124, 264), 80, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_local_reply_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_local_reply_config(msg); @@ -1437,11 +1449,11 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Lo } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_matching_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {39, UPB_SIZE(128, 45), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_error_on_invalid_http_message(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {40, UPB_SIZE(132, 272), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_error_on_invalid_http_message(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_error_on_invalid_http_message(msg); @@ -1453,7 +1465,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_headers_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {41, UPB_SIZE(136, 280), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_headers_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_headers_timeout(msg); @@ -1464,12 +1476,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_any_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* value) { const upb_MiniTableField field = {43, UPB_SIZE(144, 288), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_path_normalization_options(msg); @@ -1481,7 +1493,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http3_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {44, UPB_SIZE(148, 296), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http3_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http3_protocol_options(msg); @@ -1493,7 +1505,7 @@ UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_path_with_escaped_slashes_action(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {45, UPB_SIZE(152, 52), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_original_ip_detection_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {46, UPB_SIZE(156, 304), 0, 27, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1527,11 +1539,11 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_trailing_host_dot(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {47, UPB_SIZE(160, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scheme_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_SchemeHeaderTransformation* value) { const upb_MiniTableField field = {48, UPB_SIZE(164, 312), 85, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scheme_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_SchemeHeaderTransformation* sub = (struct envoy_config_core_v3_SchemeHeaderTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scheme_header_transformation(msg); @@ -1543,7 +1555,7 @@ UPB_INLINE struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_extensi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_proxy_status_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* value) { const upb_MiniTableField field = {49, UPB_SIZE(168, 320), 86, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_proxy_status_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_proxy_status_config(msg); @@ -1555,7 +1567,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_typed_header_validation_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {50, UPB_SIZE(172, 328), 87, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_typed_header_validation_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_typed_header_validation_config(msg); @@ -1567,7 +1579,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_append_x_forwarded_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {51, UPB_SIZE(176, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_early_header_mutation_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {52, UPB_SIZE(180, 336), 0, 31, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1601,7 +1613,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_proxy_protocol_connection_state(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {53, UPB_SIZE(184, 344), 88, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_proxy_protocol_connection_state(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_proxy_protocol_connection_state(msg); @@ -1613,7 +1625,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {54, UPB_SIZE(188, 352), 89, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_flush_interval(msg); @@ -1625,11 +1637,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_flush_access_log_on_new_request(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {55, UPB_SIZE(192, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* value) { const upb_MiniTableField field = {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_options(msg); @@ -1639,6 +1651,10 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } return sub; } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_append_local_overload(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing */ @@ -1819,7 +1835,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_client_sampling(msg); @@ -1831,7 +1847,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_random_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_random_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_random_sampling(msg); @@ -1843,7 +1859,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_overall_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_overall_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_overall_sampling(msg); @@ -1855,11 +1871,11 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_verbose(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_max_path_tag_length(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_max_path_tag_length(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_max_path_tag_length(msg); @@ -1901,7 +1917,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_extensions_filters_netw } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_provider(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_config_trace_v3_Tracing_Http* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_provider(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_provider(msg); @@ -1913,7 +1929,7 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_n } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_spawn_upstream_span(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 64), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_spawn_upstream_span(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_spawn_upstream_span(msg); @@ -2007,7 +2023,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_set_unix_sockets(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_mutable_cidr_ranges(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2143,7 +2159,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_mutable_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_subject(msg); @@ -2155,19 +2171,19 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_cert(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_dns(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_uri(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(18, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_chain(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(19, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig */ @@ -2269,7 +2285,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_set_upgrade_type(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_mutable_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2303,7 +2319,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_set_enabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_mutable_enabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_enabled(msg); @@ -2385,7 +2401,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *msg, struct envoy_type_http_v3_PathTransformation* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_forwarding_transformation(msg); @@ -2397,7 +2413,7 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filter } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_http_filter_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *msg, struct envoy_type_http_v3_PathTransformation* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_http_filter_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_http_filter_transformation(msg); @@ -2537,27 +2553,27 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_connection_termination_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_response_flags(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {3, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_set_recommended_response_code(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {4, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_use_node_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {5, 16, -13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_literal_proxy_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions */ @@ -2639,7 +2655,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_mutable_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_access_log_flush_interval(msg); @@ -2651,11 +2667,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_flush_access_log_on_new_request(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_flush_log_on_tunnel_successfully_established(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.LocalReplyConfig */ @@ -2775,7 +2791,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Re } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_set_body_format(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *msg, struct envoy_config_core_v3_SubstitutionFormatString* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mutable_body_format(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_body_format(msg); @@ -2921,7 +2937,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_accesslog_v3_AccessLogFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_filter(msg); @@ -2933,7 +2949,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_status_code(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_status_code(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_status_code(msg); @@ -2945,7 +2961,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body(msg); @@ -2957,7 +2973,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_filters_netw } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body_format_override(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_core_v3_SubstitutionFormatString* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body_format_override(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body_format_override(msg); @@ -3065,7 +3081,7 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_Rds_mutable_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source(msg); @@ -3077,7 +3093,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_route_config_name(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList */ @@ -3305,11 +3321,11 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_name(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scope_key_builder(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scope_key_builder(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scope_key_builder(msg); @@ -3321,7 +3337,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_rds_config_source(msg); @@ -3333,7 +3349,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_route_configurations_list(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_route_configurations_list(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_route_configurations_list(msg); @@ -3345,7 +3361,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_rds(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), UPB_SIZE(-21, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_rds(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_rds(msg); @@ -3520,7 +3536,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_set_header_value_extractor(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_mutable_header_value_extractor(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_header_value_extractor(msg); @@ -3636,19 +3652,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_name(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_element_separator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_index(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, uint32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), -9, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_element(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_mutable_element(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_element(msg); @@ -3722,11 +3738,11 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_set_separator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_set_key(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRds */ @@ -3796,7 +3812,7 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_set_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_mutable_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_scoped_rds_config_source(msg); @@ -3808,7 +3824,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_set_srds_resources_locator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter */ @@ -3928,11 +3944,11 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config(msg); @@ -3944,7 +3960,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_con } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_config_discovery(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_config_discovery(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_discovery(msg); @@ -3956,11 +3972,11 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_f } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_is_optional(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, bool value) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_disabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, bool value) { const upb_MiniTableField field = {7, 13, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension */ @@ -4018,7 +4034,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Requ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_set_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_typed_config(msg); @@ -4084,7 +4100,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Envo UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_set_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_mutable_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c index 57180e9d2f..a03ba035fc 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c @@ -72,17 +72,17 @@ static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_m {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init}, }; -static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[54] = { +static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[55] = { {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(20, 88), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(24, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {8, UPB_SIZE(28, 104), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {9, UPB_SIZE(32, 112), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(36, 136), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {14, UPB_SIZE(44, 152), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {19, UPB_SIZE(64, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(68, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(69, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {23, UPB_SIZE(72, 192), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(76, 200), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(80, 208), 73, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -101,7 +101,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {28, UPB_SIZE(88, 224), 75, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(92, 232), 76, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(96, 240), 77, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(104, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(105, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(108, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {39, UPB_SIZE(128, 45), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {40, UPB_SIZE(132, 272), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {41, UPB_SIZE(136, 280), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {43, UPB_SIZE(144, 288), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {44, UPB_SIZE(148, 296), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {45, UPB_SIZE(152, 52), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -127,12 +127,16 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {54, UPB_SIZE(188, 352), 89, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {55, UPB_SIZE(192, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0], - UPB_SIZE(232, 384), 54, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(240, 384), 55, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -159,7 +163,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag {0x00b000003f0001b2, &upb_pss_2bt}, {0x00c000003f0c01ba, &upb_prm_2bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003b00003f0003c8, &upb_psb1_2bt}, {0x017800302a0002d0, &upb_pob1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -194,6 +198,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[0], UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -227,6 +234,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.InternalAddressConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -251,6 +261,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0], 24, 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.SetCurrentClientCertDetails", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -278,6 +291,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -300,6 +316,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions", +#endif }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[6] = { @@ -315,6 +334,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag NULL, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.ProxyStatusConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -341,6 +363,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -363,6 +388,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.LocalReplyConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -389,6 +417,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0], UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ResponseMapper", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -414,6 +445,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.Rds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -434,6 +468,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -459,6 +496,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -483,6 +523,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -501,6 +544,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -522,6 +568,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -543,6 +592,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag NULL, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -564,6 +616,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -589,6 +644,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -613,6 +671,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { @@ -627,6 +688,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.EnvoyMobileHttpConnectionManager", +#endif }; static const upb_MiniTable *messages_layout[21] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h index 87059baf18..b04c4f3694 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSess UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState *msg, struct envoy_type_http_v3_Cookie* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_mutable_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena) { struct envoy_type_http_v3_Cookie* sub = (struct envoy_type_http_v3_Cookie*)envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c index 367f917e7c..5b8d30ea27 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__Cook &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0], &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h index e6d029c15e..c6e7a9a19f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h @@ -166,7 +166,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_client_side_weighted_ro UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_enable_oob_load_report(msg); @@ -178,7 +178,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_load_balancing_pol } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_oob_reporting_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_oob_reporting_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_oob_reporting_period(msg); @@ -190,7 +190,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_blackout_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_blackout_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_blackout_period(msg); @@ -202,7 +202,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_expiration_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_expiration_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_expiration_period(msg); @@ -214,7 +214,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_update_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_update_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_update_period(msg); @@ -226,7 +226,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_error_utilization_penalty(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_FloatValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FloatValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_error_utilization_penalty(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_FloatValue* sub = (struct google_protobuf_FloatValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_error_utilization_penalty(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c index 79ba384fe3..14d36f8d26 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c @@ -38,6 +38,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0 &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[0], &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.client_side_weighted_round_robin.v3.ClientSideWeightedRoundRobin", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h index 25be9f4f52..e05be67fda 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h @@ -120,7 +120,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbCon UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(msg); @@ -132,7 +132,7 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbC } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(msg); @@ -226,7 +226,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbCon UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(msg); @@ -238,7 +238,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policie } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(msg); @@ -250,7 +250,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig */ @@ -378,7 +378,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConf UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(msg); @@ -390,7 +390,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(msg); @@ -402,7 +402,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_bala } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(msg); @@ -480,11 +480,11 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHas UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c index 0d629746f0..895d12b0cd 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -67,6 +73,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = { @@ -85,6 +94,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Sl &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = { @@ -100,6 +112,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Co &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h index ba22565f13..f8872c8024 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h @@ -76,7 +76,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_set_shuffle_address_list(envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c index 90efd4432e..d9d62595cb 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__pick_0first__v NULL, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.pick_first.v3.PickFirst", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h index fd1b1a9122..622dc30b50 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h @@ -182,11 +182,11 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_h UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_hash_function(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_minimum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_minimum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_minimum_ring_size(msg); @@ -198,7 +198,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_maximum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_maximum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_maximum_ring_size(msg); @@ -210,11 +210,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_hash_balance_factor(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_hash_balance_factor(msg); @@ -226,7 +226,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_consistent_hashing_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_consistent_hashing_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_consistent_hashing_lb_config(msg); @@ -238,7 +238,7 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_ConsistentH } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_locality_weighted_lb_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c index a5904caf39..2685586b5f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c @@ -39,6 +39,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3 &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0], &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[0], UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.ring_hash.v3.RingHash", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h index 25506249a4..808b136801 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLoca UPB_INLINE void envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_set_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality *msg, struct envoy_config_cluster_v3_LoadBalancingPolicy* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_mutable_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_endpoint_picking_policy(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c index 7675aefab1..249345c098 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality_ &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0], &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.wrr_locality.v3.WrrLocality", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h index e0d3a320d2..5949405a95 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h @@ -38,6 +38,7 @@ typedef struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys { typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance; typedef struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher; typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext; +typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts; struct envoy_config_core_v3_DataSource; struct envoy_config_core_v3_TypedExtensionConfig; struct envoy_config_core_v3_WatchedDirectory; @@ -56,7 +57,8 @@ typedef enum { envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_EMAIL = 1, envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_DNS = 2, envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_URI = 3, - envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4 + envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4, + envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_OTHER_NAME = 5 } envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SanType; typedef enum { @@ -228,11 +230,11 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_s UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) { upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -407,11 +409,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_fal UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(msg); @@ -423,7 +425,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3 } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_fallback(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.TlsCertificate */ @@ -609,7 +611,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_pkc UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(msg); @@ -621,7 +623,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(msg); @@ -633,7 +635,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(msg); @@ -645,7 +647,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(msg); @@ -687,7 +689,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(msg); @@ -699,7 +701,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_WatchedDirectory* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(msg); @@ -711,7 +713,7 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transp } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(msg); @@ -885,11 +887,11 @@ UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateP UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher */ @@ -956,14 +958,26 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_ const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_oid(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_oid(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_mutable_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(msg); @@ -973,6 +987,10 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transpor } return sub; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_oid(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, upb_StringView value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext */ @@ -1286,10 +1304,26 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationC const upb_MiniTableField field = {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* default_val = NULL; + const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret; + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_system_root_certs(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(msg); @@ -1357,7 +1391,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(msg); @@ -1369,7 +1403,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(msg); @@ -1381,7 +1415,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(36, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1415,11 +1449,11 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transpor } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, int32_t value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_WatchedDirectory* value) { const upb_MiniTableField field = {11, UPB_SIZE(44, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(msg); @@ -1431,7 +1465,7 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transp } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {12, UPB_SIZE(48, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(msg); @@ -1443,7 +1477,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_tr } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) { const upb_MiniTableField field = {13, UPB_SIZE(52, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(msg); @@ -1455,7 +1489,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderP } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(56, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { upb_MiniTableField field = {15, UPB_SIZE(60, 96), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1489,7 +1523,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatche } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(msg); @@ -1499,6 +1533,56 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket } return sub; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* value) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { + struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, arena); + if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_system_root_certs(msg, sub); + } + return sub; +} + +/* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts */ + +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(upb_Arena* arena) { + return (envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, arena); +} +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, options, arena, &ptr, len); + return ptr; +} + #ifdef __cplusplus } /* extern "C" */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c index 3d40a212a1..53b28a2136 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameter NULL, &envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsParameters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyPr &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -99,6 +105,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertifica &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0], UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsCertificate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -123,6 +132,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTi &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -138,6 +150,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateP NULL, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -150,22 +165,28 @@ static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SubjectA {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, }; -static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[2] = { +static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[3] = { {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init = { &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, + UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001800003f00001a, &upb_pss_1bt}, }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[9] = { +static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, @@ -175,9 +196,10 @@ static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_Certific {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init}, }; -static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[14] = { +static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[15] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -192,12 +214,16 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Certif {14, UPB_SIZE(56, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {15, UPB_SIZE(60, 96), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init = { &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0], - UPB_SIZE(72, 112), 14, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(72, 120), 15, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -218,7 +244,16 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateV }) }; -static const upb_MiniTable *messages_layout[7] = { +const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init = { + NULL, + NULL, + 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts", +#endif +}; + +static const upb_MiniTable *messages_layout[8] = { &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, @@ -226,13 +261,14 @@ static const upb_MiniTable *messages_layout[7] = { &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, + &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, }; const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout = { messages_layout, NULL, NULL, - 7, + 8, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h index 7ff2357258..233709125b 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h @@ -24,6 +24,7 @@ extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSe extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init; +extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout; diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h index 8d8e75357e..ba91855976 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_GenericSecret_has_secr UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_GenericSecret_set_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_GenericSecret_mutable_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_GenericSecret_secret(msg); @@ -171,11 +171,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_has_sd UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_name(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sds_config(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_mutable_sds_config(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_config(msg); @@ -313,11 +313,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_Secret_has_generic_sec UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_name(envoy_extensions_transport_sockets_tls_v3_Secret *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_tls_certificate(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_tls_certificate(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)envoy_extensions_transport_sockets_tls_v3_Secret_tls_certificate(msg); @@ -329,7 +329,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envo } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_Secret_session_ticket_keys(msg); @@ -341,7 +341,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_validation_context(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_Secret_validation_context(msg); @@ -353,7 +353,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidatio } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_generic_secret(envoy_extensions_transport_sockets_tls_v3_Secret *msg, envoy_extensions_transport_sockets_tls_v3_GenericSecret* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_generic_secret(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* sub = (struct envoy_extensions_transport_sockets_tls_v3_GenericSecret*)envoy_extensions_transport_sockets_tls_v3_Secret_generic_secret(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c index aada248ce0..8f168e1c3e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecre &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.GenericSecret", +#endif }; static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { @@ -46,6 +49,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretCon &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -71,6 +77,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_i &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_Secret__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.Secret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h index fb6d61b9e0..93287c34ab 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_has UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_common_tls_context(msg); @@ -180,15 +180,15 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* en } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_sni(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_allow_renegotiation(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_max_session_keys(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_max_session_keys(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_max_session_keys(msg); @@ -200,7 +200,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_enforce_rsa_key_usage(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_enforce_rsa_key_usage(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_enforce_rsa_key_usage(msg); @@ -413,7 +413,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_d UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_common_tls_context(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_common_tls_context(msg); @@ -425,7 +425,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* en } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_client_certificate(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_client_certificate(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_client_certificate(msg); @@ -437,7 +437,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_sni(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_sni(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_sni(msg); @@ -449,7 +449,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* value) { const upb_MiniTableField field = {4, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys(msg); @@ -461,7 +461,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys_sds_secret_config(msg); @@ -473,7 +473,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_timeout(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_timeout(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_timeout(msg); @@ -485,15 +485,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_transport_sockets_t } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_disable_stateless_session_resumption(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_ocsp_staple_policy(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_full_scan_certs_on_sni_mismatch(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 68, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_full_scan_certs_on_sni_mismatch(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_full_scan_certs_on_sni_mismatch(msg); @@ -505,7 +505,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_disable_stateful_session_resumption(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.TlsKeyLog */ @@ -623,7 +623,7 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_remot UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_set_path(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_mutable_local_address_range(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1010,7 +1010,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_has_k UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_params(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_params(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsParameters*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_params(msg); @@ -1052,7 +1052,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envo } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {3, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context(msg); @@ -1122,7 +1122,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_sds_secret_config(msg); @@ -1134,7 +1134,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_combined_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* value) { const upb_MiniTableField field = {8, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_combined_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_combined_validation_context(msg); @@ -1146,7 +1146,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Com } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 48), 65, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider(msg); @@ -1158,7 +1158,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {10, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider(msg); @@ -1170,7 +1170,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {11, UPB_SIZE(32, 56), 66, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider_instance(msg); @@ -1182,7 +1182,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider_instance(msg); @@ -1194,7 +1194,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_custom_handshaker(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {13, UPB_SIZE(40, 64), 67, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_custom_handshaker(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_custom_handshaker(msg); @@ -1206,7 +1206,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_tr } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 72), 68, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_provider_instance(msg); @@ -1218,7 +1218,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderP } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_key_log(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* value) { const upb_MiniTableField field = {15, UPB_SIZE(48, 80), 69, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_key_log(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_key_log(msg); @@ -1305,11 +1305,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certi UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_set_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_typed_config(msg); @@ -1383,11 +1383,11 @@ UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CommonTlsCon UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext */ @@ -1493,7 +1493,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_default_validation_context(msg); @@ -1505,7 +1505,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidatio } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_sds_secret_config(msg); @@ -1517,7 +1517,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider(msg); @@ -1529,7 +1529,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider_instance(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c index 9824a992a7..b8ff4989e6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c @@ -40,6 +40,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsC &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -75,6 +78,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTl &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0], UPB_SIZE(48, 72), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -110,6 +116,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_ms &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsKeyLog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -155,6 +164,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0], UPB_SIZE(56, 96), 14, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -188,6 +200,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -205,6 +220,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon NULL, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -231,6 +249,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext", +#endif }; static const upb_MiniTable *messages_layout[7] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h index 50a753315f..a661d08ad1 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h @@ -196,11 +196,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCon UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_set_name(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_set_trust_bundle(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_mutable_trust_bundle(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_trust_bundle(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c index dbe3abba76..94fd8341dd 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig.TrustDomain", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h index a904284b14..5869d7af4f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h @@ -218,7 +218,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_has_heade UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_common_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_common_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_common_http_protocol_options(msg); @@ -230,7 +230,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_ups } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_upstream_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_upstream_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_upstream_http_protocol_options(msg); @@ -242,7 +242,7 @@ UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_extens } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_explicit_http_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_explicit_http_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_explicit_http_config(msg); @@ -254,7 +254,7 @@ UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_Explici } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_use_downstream_protocol_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_use_downstream_protocol_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_use_downstream_protocol_config(msg); @@ -266,7 +266,7 @@ UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDown } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_auto_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_auto_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_auto_config(msg); @@ -308,7 +308,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_header_validation_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 66, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_header_validation_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_header_validation_config(msg); @@ -417,7 +417,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitH UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http_protocol_options(msg); @@ -429,7 +429,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http2_protocol_options(msg); @@ -441,7 +441,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http3_protocol_options(msg); @@ -539,7 +539,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownst UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http_protocol_options(msg); @@ -551,7 +551,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http2_protocol_options(msg); @@ -563,7 +563,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http3_protocol_options(msg); @@ -677,7 +677,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpC UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http_protocol_options(msg); @@ -689,7 +689,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http2_protocol_options(msg); @@ -701,7 +701,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http3_protocol_options(msg); @@ -713,7 +713,7 @@ UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_alternate_protocols_cache_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_AlternateProtocolsCacheOptions* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_alternate_protocols_cache_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_AlternateProtocolsCacheOptions* sub = (struct envoy_config_core_v3_AlternateProtocolsCacheOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_alternate_protocols_cache_options(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c index bca3261db8..fde736fba2 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c @@ -41,6 +41,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions__fields[0], UPB_SIZE(40, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -69,6 +72,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.ExplicitHttpConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -93,6 +99,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.UseDownstreamHttpConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = { @@ -113,6 +122,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.AutoHttpConfig", +#endif }; static const upb_MiniTable *messages_layout[4] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c index 882dbe5fba..375955de93 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c @@ -19,6 +19,9 @@ const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.AdsDummy", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h index bebc961921..efc38874db 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h @@ -130,7 +130,7 @@ UPB_INLINE upb_Map* _envoy_service_discovery_v3_ResourceLocator_dynamic_paramete UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_set_name(envoy_service_discovery_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_clear(envoy_service_discovery_v3_ResourceLocator* msg) { const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -242,11 +242,11 @@ UPB_INLINE bool envoy_service_discovery_v3_ResourceName_has_dynamic_parameter_co UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_name(envoy_service_discovery_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_dynamic_parameter_constraints(envoy_service_discovery_v3_ResourceName *msg, envoy_service_discovery_v3_DynamicParameterConstraints* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_ResourceName_mutable_dynamic_parameter_constraints(envoy_service_discovery_v3_ResourceName* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_ResourceName_dynamic_parameter_constraints(msg); @@ -428,11 +428,11 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DiscoveryRequest_resource_loca UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_version_info(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_node(envoy_service_discovery_v3_DiscoveryRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DiscoveryRequest_mutable_node(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DiscoveryRequest_node(msg); @@ -472,15 +472,15 @@ UPB_INLINE bool envoy_service_discovery_v3_DiscoveryRequest_add_resource_names(e } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_type_url(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_response_nonce(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_error_detail(envoy_service_discovery_v3_DiscoveryRequest *msg, struct google_rpc_Status* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 80), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) { struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DiscoveryRequest_error_detail(msg); @@ -656,7 +656,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DiscoveryResponse_has_control_plane(c UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_version_info(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_service_discovery_v3_DiscoveryResponse_mutable_resources(envoy_service_discovery_v3_DiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -690,19 +690,19 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_DiscoveryRespo } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_canary(envoy_service_discovery_v3_DiscoveryResponse *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_type_url(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_nonce(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_control_plane(envoy_service_discovery_v3_DiscoveryResponse *msg, struct envoy_config_core_v3_ControlPlane* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DiscoveryResponse* msg, upb_Arena* arena) { struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DiscoveryResponse_control_plane(msg); @@ -965,7 +965,7 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_node(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_node(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DeltaDiscoveryRequest_node(msg); @@ -977,7 +977,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DeltaDis } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_type_url(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_resource_names_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1062,11 +1062,11 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersi } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_response_nonce(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_error_detail(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, struct google_rpc_Status* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DeltaDiscoveryRequest_error_detail(msg); @@ -1341,7 +1341,7 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_removed UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_system_version_info(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_service_discovery_v3_Resource** envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1375,11 +1375,11 @@ UPB_INLINE struct envoy_service_discovery_v3_Resource* envoy_service_discovery_v } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_type_url(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(36, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_nonce(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(16, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1411,7 +1411,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_add_removed_re } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, struct envoy_config_core_v3_ControlPlane* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 80), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, upb_Arena* arena) { struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DeltaDiscoveryResponse_control_plane(msg); @@ -1567,7 +1567,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DynamicParameterConstraints_has_not_c UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_constraint(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_constraint(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)envoy_service_discovery_v3_DynamicParameterConstraints_constraint(msg); @@ -1579,7 +1579,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleC } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_or_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_or_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_or_constraints(msg); @@ -1591,7 +1591,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_Constra } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_and_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_and_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_and_constraints(msg); @@ -1603,7 +1603,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_Constra } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_not_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_not_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_DynamicParameterConstraints_not_constraints(msg); @@ -1707,15 +1707,15 @@ UPB_INLINE bool envoy_service_discovery_v3_DynamicParameterConstraints_SingleCon UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_key(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_value(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_exists(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_mutable_exists(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_exists(msg); @@ -2039,11 +2039,11 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_has_metadata(const envoy_ser UPB_INLINE void envoy_service_discovery_v3_Resource_set_version(envoy_service_discovery_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource(envoy_service_discovery_v3_Resource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_Resource_mutable_resource(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_discovery_v3_Resource_resource(msg); @@ -2055,7 +2055,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_Resource_mutab } UPB_INLINE void envoy_service_discovery_v3_Resource_set_name(envoy_service_discovery_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_Resource_mutable_aliases(envoy_service_discovery_v3_Resource* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2087,7 +2087,7 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_add_aliases(envoy_service_di } UPB_INLINE void envoy_service_discovery_v3_Resource_set_ttl(envoy_service_discovery_v3_Resource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_mutable_ttl(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_discovery_v3_Resource_ttl(msg); @@ -2099,7 +2099,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_ } UPB_INLINE void envoy_service_discovery_v3_Resource_set_cache_control(envoy_service_discovery_v3_Resource *msg, envoy_service_discovery_v3_Resource_CacheControl* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_mutable_cache_control(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_Resource_CacheControl* sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)envoy_service_discovery_v3_Resource_cache_control(msg); @@ -2111,7 +2111,7 @@ UPB_INLINE struct envoy_service_discovery_v3_Resource_CacheControl* envoy_servic } UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource_name(envoy_service_discovery_v3_Resource *msg, envoy_service_discovery_v3_ResourceName* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 80), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_Resource_mutable_resource_name(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_ResourceName* sub = (struct envoy_service_discovery_v3_ResourceName*)envoy_service_discovery_v3_Resource_resource_name(msg); @@ -2123,7 +2123,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discove } UPB_INLINE void envoy_service_discovery_v3_Resource_set_metadata(envoy_service_discovery_v3_Resource *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 88), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_service_discovery_v3_Resource_mutable_metadata(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_service_discovery_v3_Resource_metadata(msg); @@ -2185,7 +2185,7 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_CacheControl_do_not_cache(co UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cache(envoy_service_discovery_v3_Resource_CacheControl *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c index 252388a1f5..744b5fd20f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = { &envoy_service_discovery_v3_ResourceLocator_submsgs[0], &envoy_service_discovery_v3_ResourceLocator__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceLocator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParam NULL, &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceLocator.DynamicParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -68,6 +74,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = { &envoy_service_discovery_v3_ResourceName_submsgs[0], &envoy_service_discovery_v3_ResourceName__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -94,6 +103,9 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = { &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DiscoveryRequest__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DiscoveryRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DiscoveryResponse__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DiscoveryResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -160,6 +175,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_ini &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0], UPB_SIZE(56, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -189,6 +207,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__Initia NULL, &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryRequest.InitialResourceVersionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -217,6 +238,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_in &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -255,6 +279,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_m &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -281,6 +308,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -293,6 +323,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint.Exists", +#endif }; static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = { @@ -307,6 +340,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.ConstraintList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -336,6 +372,9 @@ const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = { &envoy_service_discovery_v3_Resource_submsgs[0], &envoy_service_discovery_v3_Resource__fields[0], UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.Resource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -356,6 +395,9 @@ const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_in NULL, &envoy_service_discovery_v3_Resource_CacheControl__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.Resource.CacheControl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h index 46069d5d7a..3a54812419 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h @@ -120,7 +120,7 @@ UPB_INLINE upb_Array* _envoy_service_load_stats_v3_LoadStatsRequest_cluster_stat UPB_INLINE void envoy_service_load_stats_v3_LoadStatsRequest_set_node(envoy_service_load_stats_v3_LoadStatsRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(envoy_service_load_stats_v3_LoadStatsRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_load_stats_v3_LoadStatsRequest_node(msg); @@ -300,7 +300,7 @@ UPB_INLINE bool envoy_service_load_stats_v3_LoadStatsResponse_add_clusters(envoy } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_load_reporting_interval(envoy_service_load_stats_v3_LoadStatsResponse *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_service_load_stats_v3_LoadStatsResponse_mutable_load_reporting_interval(envoy_service_load_stats_v3_LoadStatsResponse* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_load_stats_v3_LoadStatsResponse_load_reporting_interval(msg); @@ -312,11 +312,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_service_load_stats_v3_LoadStat } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_report_endpoint_granularity(envoy_service_load_stats_v3_LoadStatsResponse *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_send_all_clusters(envoy_service_load_stats_v3_LoadStatsResponse *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c index 850a103bbc..9692dc5530 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0], &envoy_service_load_stats_v3_LoadStatsRequest__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.load_stats.v3.LoadStatsRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -54,6 +57,9 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0], &envoy_service_load_stats_v3_LoadStatsResponse__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.load_stats.v3.LoadStatsResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h index ea96938843..65767ff2c1 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h @@ -191,7 +191,7 @@ UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher* envoy_service_status_v3_Cli } UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_node(envoy_service_status_v3_ClientStatusRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatusRequest_mutable_node(envoy_service_status_v3_ClientStatusRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientStatusRequest_node(msg); @@ -203,7 +203,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatu } UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_exclude_resource_contents(envoy_service_status_v3_ClientStatusRequest *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.PerXdsConfig */ @@ -362,11 +362,11 @@ UPB_INLINE int32_t envoy_service_status_v3_PerXdsConfig_client_status(const envo UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_listener_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ListenersConfigDump* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_listener_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_ListenersConfigDump* sub = (struct envoy_admin_v3_ListenersConfigDump*)envoy_service_status_v3_PerXdsConfig_listener_config(msg); @@ -378,7 +378,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_Pe } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_cluster_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ClustersConfigDump* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_cluster_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_ClustersConfigDump* sub = (struct envoy_admin_v3_ClustersConfigDump*)envoy_service_status_v3_PerXdsConfig_cluster_config(msg); @@ -390,7 +390,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_Per } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_RoutesConfigDump* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_route_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_RoutesConfigDump* sub = (struct envoy_admin_v3_RoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_route_config(msg); @@ -402,7 +402,7 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXd } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ScopedRoutesConfigDump* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_scoped_route_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_ScopedRoutesConfigDump* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_scoped_route_config(msg); @@ -414,7 +414,7 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3 } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_endpoint_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_EndpointsConfigDump* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_endpoint_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_EndpointsConfigDump* sub = (struct envoy_admin_v3_EndpointsConfigDump*)envoy_service_status_v3_PerXdsConfig_endpoint_config(msg); @@ -426,7 +426,7 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_Pe } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_client_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {7, 16, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientConfig */ @@ -560,7 +560,7 @@ UPB_INLINE upb_StringView envoy_service_status_v3_ClientConfig_client_scope(cons UPB_INLINE void envoy_service_status_v3_ClientConfig_set_node(envoy_service_status_v3_ClientConfig *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientConfig_mutable_node(envoy_service_status_v3_ClientConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientConfig_node(msg); @@ -632,7 +632,7 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_s } UPB_INLINE void envoy_service_status_v3_ClientConfig_set_client_scope(envoy_service_status_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientConfig.GenericXdsConfig */ @@ -794,19 +794,19 @@ UPB_INLINE bool envoy_service_status_v3_ClientConfig_GenericXdsConfig_is_static_ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_type_url(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_name(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_version_info(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(52, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_xds_config(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 72), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_xds_config(msg); @@ -818,7 +818,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_status_v3_ClientConfig_Gene } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 80), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_last_updated(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_last_updated(msg); @@ -830,15 +830,15 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_service_status_v3_ClientConfi } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_config_status(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client_status(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 88), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_error_state(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_error_state(msg); @@ -850,7 +850,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_service_status_v3_Cli } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_is_static_resource(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, bool value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientStatusResponse */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c index 7bf4a562bc..4dafb073d4 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = { &envoy_service_status_v3_ClientStatusRequest_submsgs[0], &envoy_service_status_v3_ClientStatusRequest__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientStatusRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -66,6 +69,9 @@ const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = { &envoy_service_status_v3_PerXdsConfig_submsgs[0], &envoy_service_status_v3_PerXdsConfig__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.PerXdsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -95,6 +101,9 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = { &envoy_service_status_v3_ClientConfig_submsgs[0], &envoy_service_status_v3_ClientConfig__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -129,6 +138,9 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_m &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0], &envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0], UPB_SIZE(64, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientConfig.GenericXdsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -161,6 +173,9 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = &envoy_service_status_v3_ClientStatusResponse_submsgs[0], &envoy_service_status_v3_ClientStatusResponse__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientStatusResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h index 452b0ab957..d55b10d866 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h @@ -107,11 +107,11 @@ UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_path(const envoy_type_http_v UPB_INLINE void envoy_type_http_v3_Cookie_set_name(envoy_type_http_v3_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_http_v3_Cookie_set_ttl(envoy_type_http_v3_Cookie *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_ttl(envoy_type_http_v3_Cookie* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_http_v3_Cookie_ttl(msg); @@ -123,7 +123,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_tt } UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c index 4b510a8140..4a43d458d2 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = { &envoy_type_http_v3_Cookie_submsgs[0], &envoy_type_http_v3_Cookie__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.Cookie", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h index 92f12817d3..c960665265 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h @@ -210,7 +210,7 @@ UPB_INLINE bool envoy_type_http_v3_PathTransformation_Operation_has_merge_slashe UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_normalize_path_rfc_3986(envoy_type_http_v3_PathTransformation_Operation *msg, envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* envoy_type_http_v3_PathTransformation_Operation_mutable_normalize_path_rfc_3986(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* sub = (struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)envoy_type_http_v3_PathTransformation_Operation_normalize_path_rfc_3986(msg); @@ -222,7 +222,7 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathR } UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_merge_slashes(envoy_type_http_v3_PathTransformation_Operation *msg, envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_type_http_v3_PathTransformation_Operation_mutable_merge_slashes(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* sub = (struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)envoy_type_http_v3_PathTransformation_Operation_merge_slashes(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c index 0b2d52dca3..210a0daa64 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = { &envoy_type_http_v3_PathTransformation_submsgs[0], &envoy_type_http_v3_PathTransformation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_ini &envoy_type_http_v3_PathTransformation_Operation_submsgs[0], &envoy_type_http_v3_PathTransformation_Operation__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -58,12 +64,18 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__Normal NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation.NormalizePathRFC3986", +#endif }; const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation.MergeSlashes", +#endif }; static const upb_MiniTable *messages_layout[4] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h index 4eff370348..03253db4d6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h @@ -104,11 +104,11 @@ UPB_INLINE bool envoy_type_matcher_v3_FilterStateMatcher_has_string_match(const UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_key(envoy_type_matcher_v3_FilterStateMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_string_match(envoy_type_matcher_v3_FilterStateMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_FilterStateMatcher_string_match(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c index 61c5a81386..7a15139bdc 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = { &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0], &envoy_type_matcher_v3_FilterStateMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.FilterStateMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h index 67842ebe86..d908fec9a7 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h @@ -81,7 +81,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestHeaderMatchInput_head UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpRequestTrailerMatchInput */ @@ -135,7 +135,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestTrailerMatchInput_hea UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpResponseHeaderMatchInput */ @@ -189,7 +189,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseHeaderMatchInput_hea UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpResponseTrailerMatchInput */ @@ -243,7 +243,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseTrailerMatchInput_he UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpRequestQueryParamMatchInput */ @@ -297,7 +297,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_ UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c index 6b28ca0b97..06abd1fa52 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_in NULL, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestHeaderMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_i NULL, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestTrailerMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -50,6 +56,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_i NULL, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseHeaderMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -64,6 +73,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_ NULL, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseTrailerMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -78,6 +90,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_ms NULL, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestQueryParamMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h index cdbe2f347e..de6034d7f6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h @@ -141,7 +141,7 @@ UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_invert(const envoy_type_ma UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_filter(envoy_type_matcher_v3_MetadataMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_mutable_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -175,7 +175,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_ } UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_value(envoy_type_matcher_v3_MetadataMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_mutable_value(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_MetadataMatcher_value(msg); @@ -187,7 +187,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_Meta } UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_invert(envoy_type_matcher_v3_MetadataMatcher *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.MetadataMatcher.PathSegment */ @@ -254,7 +254,7 @@ UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_PathSegment_has_key(const UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c index e4bb87fe1f..3225a2ab0e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = { &envoy_type_matcher_v3_MetadataMatcher_submsgs[0], &envoy_type_matcher_v3_MetadataMatcher__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.MetadataMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_i NULL, &envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.MetadataMatcher.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h index 8bd538b76a..8391ff7d1d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h @@ -117,7 +117,7 @@ UPB_INLINE upb_Array* _envoy_type_matcher_v3_NodeMatcher_node_metadatas_mutable_ UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_set_node_id(envoy_type_matcher_v3_NodeMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_NodeMatcher_mutable_node_id(envoy_type_matcher_v3_NodeMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_NodeMatcher_node_id(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c index 0a1f96f876..aee0c43b65 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = { &envoy_type_matcher_v3_NodeMatcher_submsgs[0], &envoy_type_matcher_v3_NodeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.NodeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h index 1c70d4436e..a9597359a9 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h @@ -110,7 +110,7 @@ UPB_INLINE bool envoy_type_matcher_v3_DoubleMatcher_has_exact(const envoy_type_m UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_range(envoy_type_matcher_v3_DoubleMatcher *msg, struct envoy_type_v3_DoubleRange* value) { const upb_MiniTableField field = {1, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleMatcher_mutable_range(envoy_type_matcher_v3_DoubleMatcher* msg, upb_Arena* arena) { struct envoy_type_v3_DoubleRange* sub = (struct envoy_type_v3_DoubleRange*)envoy_type_matcher_v3_DoubleMatcher_range(msg); @@ -122,7 +122,7 @@ UPB_INLINE struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleMatcher } UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_exact(envoy_type_matcher_v3_DoubleMatcher *msg, double value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c index b9df0f5994..561ceb9874 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = { &envoy_type_matcher_v3_DoubleMatcher_submsgs[0], &envoy_type_matcher_v3_DoubleMatcher__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.DoubleMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h index 596f41b31b..c61a147b8d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_type_matcher_v3_PathMatcher_has_path(const envoy_type_matc UPB_INLINE void envoy_type_matcher_v3_PathMatcher_set_path(envoy_type_matcher_v3_PathMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_PathMatcher_mutable_path(envoy_type_matcher_v3_PathMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_PathMatcher_path(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c index 13475d9bdc..2b0006b360 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = { &envoy_type_matcher_v3_PathMatcher_submsgs[0], &envoy_type_matcher_v3_PathMatcher__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.PathMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h index 875e274121..98d33474d0 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h @@ -108,7 +108,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatcher_regex(const envoy_t UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_google_re2(envoy_type_matcher_v3_RegexMatcher *msg, envoy_type_matcher_v3_RegexMatcher_GoogleRE2* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_mutable_google_re2(envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)envoy_type_matcher_v3_RegexMatcher_google_re2(msg); @@ -120,7 +120,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_match } UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_regex(envoy_type_matcher_v3_RegexMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.RegexMatcher.GoogleRE2 */ @@ -178,7 +178,7 @@ UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_GoogleRE2_has_max_program_siz UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_mutable_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(msg); @@ -256,7 +256,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatchAndSubstitute_substitu UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_mutable_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(msg); @@ -268,7 +268,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_Rege } UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c index a0a1fee6c7..fb238383c6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = { &envoy_type_matcher_v3_RegexMatcher_submsgs[0], &envoy_type_matcher_v3_RegexMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000080100000a, &upb_pom_1bt_max64b}, @@ -50,6 +53,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0], &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatcher.GoogleRE2", +#endif }; static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { @@ -65,6 +71,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0], &envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatchAndSubstitute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c index 0ca616dc7d..4b15e52f27 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c @@ -17,12 +17,18 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseStatusCodeMatchInput", +#endif }; const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseStatusCodeClassMatchInput", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h index c8dc27ac48..f52d767e28 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h @@ -13,6 +13,7 @@ #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/matcher/v3/regex.upb_minitable.h" +#include "xds/core/v3/extension.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -27,6 +28,7 @@ extern "C" { typedef struct envoy_type_matcher_v3_StringMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_StringMatcher; typedef struct envoy_type_matcher_v3_ListStringMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_ListStringMatcher; struct envoy_type_matcher_v3_RegexMatcher; +struct xds_core_v3_TypedExtensionConfig; @@ -72,6 +74,7 @@ typedef enum { envoy_type_matcher_v3_StringMatcher_match_pattern_suffix = 3, envoy_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5, envoy_type_matcher_v3_StringMatcher_match_pattern_contains = 7, + envoy_type_matcher_v3_StringMatcher_match_pattern_custom = 8, envoy_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0 } envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases; UPB_INLINE envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases envoy_type_matcher_v3_StringMatcher_match_pattern_case(const envoy_type_matcher_v3_StringMatcher* msg) { @@ -171,22 +174,38 @@ UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_contains(const envoy_typ const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_custom(envoy_type_matcher_v3_StringMatcher* msg) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* envoy_type_matcher_v3_StringMatcher_custom(const envoy_type_matcher_v3_StringMatcher* msg) { + const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; + const struct xds_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_custom(const envoy_type_matcher_v3_StringMatcher* msg) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_exact(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_prefix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_suffix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_safe_regex(envoy_type_matcher_v3_StringMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_mutable_safe_regex(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_StringMatcher_safe_regex(msg); @@ -198,11 +217,23 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_Stri } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_ignore_case(envoy_type_matcher_v3_StringMatcher *msg, bool value) { const upb_MiniTableField field = {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_contains(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_custom(envoy_type_matcher_v3_StringMatcher *msg, struct xds_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct xds_core_v3_TypedExtensionConfig* envoy_type_matcher_v3_StringMatcher_mutable_custom(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { + struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)envoy_type_matcher_v3_StringMatcher_custom(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_type_matcher_v3_StringMatcher_set_custom(msg, sub); + } + return sub; } /* envoy.type.matcher.v3.ListStringMatcher */ diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c index 568743b69a..22adb6bf23 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c @@ -9,6 +9,7 @@ #include "upb/generated_code_support.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/matcher/v3/regex.upb_minitable.h" +#include "xds/core/v3/extension.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -16,23 +17,28 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[1] = { +static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[6] = { +static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[7] = { {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { &envoy_type_matcher_v3_StringMatcher_submsgs[0], &envoy_type_matcher_v3_StringMatcher__fields[0], - UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -42,6 +48,14 @@ const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { {0x0010000c0500002a, &upb_pom_1bt_maxmaxb}, {0x000800003f000030, &upb_psb1_1bt}, {0x0010000c0700003a, &upb_pos_1bt}, + {0x0010000c08010042, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -57,6 +71,9 @@ const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = { &envoy_type_matcher_v3_ListStringMatcher_submsgs[0], &envoy_type_matcher_v3_ListStringMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ListStringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h index d43a1056bf..547291911a 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h @@ -147,7 +147,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_ma } UPB_INLINE void envoy_type_matcher_v3_StructMatcher_set_value(envoy_type_matcher_v3_StructMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_mutable_value(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_StructMatcher_value(msg); @@ -222,7 +222,7 @@ UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_PathSegment_has_key(const en UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c index 8484febbcc..330d63f80e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = { &envoy_type_matcher_v3_StructMatcher_submsgs[0], &envoy_type_matcher_v3_StructMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StructMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_ini NULL, &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StructMatcher.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h index 12fd8b4b81..f6cdac0e42 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h @@ -200,7 +200,7 @@ UPB_INLINE bool envoy_type_matcher_v3_ValueMatcher_has_or_match(const envoy_type UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_null_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_ValueMatcher_NullMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_ValueMatcher_mutable_null_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher_NullMatch* sub = (struct envoy_type_matcher_v3_ValueMatcher_NullMatch*)envoy_type_matcher_v3_ValueMatcher_null_match(msg); @@ -212,7 +212,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_match } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_double_match(envoy_type_matcher_v3_ValueMatcher *msg, struct envoy_type_matcher_v3_DoubleMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_double_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_DoubleMatcher* sub = (struct envoy_type_matcher_v3_DoubleMatcher*)envoy_type_matcher_v3_ValueMatcher_double_match(msg); @@ -224,7 +224,7 @@ UPB_INLINE struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_Val } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_string_match(envoy_type_matcher_v3_ValueMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_string_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_ValueMatcher_string_match(msg); @@ -236,15 +236,15 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Val } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_bool_match(envoy_type_matcher_v3_ValueMatcher *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_present_match(envoy_type_matcher_v3_ValueMatcher *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_list_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_ListMatcher* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_list_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ListMatcher* sub = (struct envoy_type_matcher_v3_ListMatcher*)envoy_type_matcher_v3_ValueMatcher_list_match(msg); @@ -256,7 +256,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_Value } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_or_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_OrMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_OrMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_or_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_OrMatcher* sub = (struct envoy_type_matcher_v3_OrMatcher*)envoy_type_matcher_v3_ValueMatcher_or_match(msg); @@ -369,7 +369,7 @@ UPB_INLINE bool envoy_type_matcher_v3_ListMatcher_has_one_of(const envoy_type_ma UPB_INLINE void envoy_type_matcher_v3_ListMatcher_set_one_of(envoy_type_matcher_v3_ListMatcher *msg, envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ListMatcher_mutable_one_of(envoy_type_matcher_v3_ListMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_ListMatcher_one_of(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c index 0967c114ba..17bd63007d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c @@ -39,6 +39,9 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = { &envoy_type_matcher_v3_ValueMatcher_submsgs[0], &envoy_type_matcher_v3_ValueMatcher__fields[0], UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ValueMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ValueMatcher.NullMatch", +#endif }; static const upb_MiniTableSub envoy_type_matcher_v3_ListMatcher_submsgs[1] = { @@ -69,6 +75,9 @@ const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = { &envoy_type_matcher_v3_ListMatcher_submsgs[0], &envoy_type_matcher_v3_ListMatcher__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ListMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -87,6 +96,9 @@ const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init = { &envoy_type_matcher_v3_OrMatcher_submsgs[0], &envoy_type_matcher_v3_OrMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.OrMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h index 91ff43bf06..27de07aa9c 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h @@ -116,7 +116,7 @@ UPB_INLINE upb_Array* _envoy_type_metadata_v3_MetadataKey_path_mutable_upb_array UPB_INLINE void envoy_type_metadata_v3_MetadataKey_set_key(envoy_type_metadata_v3_MetadataKey *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_mutable_path(envoy_type_metadata_v3_MetadataKey* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -213,7 +213,7 @@ UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_PathSegment_has_key(const env UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_set_key(envoy_type_metadata_v3_MetadataKey_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.metadata.v3.MetadataKind */ @@ -331,7 +331,7 @@ UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_host(const envoy_type_me UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_request(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Request* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_mutable_request(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Request* sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)envoy_type_metadata_v3_MetadataKind_request(msg); @@ -343,7 +343,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metada } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_route(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Route* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_mutable_route(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Route* sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)envoy_type_metadata_v3_MetadataKind_route(msg); @@ -355,7 +355,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_cluster(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Cluster* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_mutable_cluster(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Cluster* sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)envoy_type_metadata_v3_MetadataKind_cluster(msg); @@ -367,7 +367,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metada } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_host(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Host* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_mutable_host(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Host* sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)envoy_type_metadata_v3_MetadataKind_host(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c index 8a51c59b44..866f03dad5 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = { &envoy_type_metadata_v3_MetadataKey_submsgs[0], &envoy_type_metadata_v3_MetadataKey__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKey", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -44,6 +47,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init NULL, &envoy_type_metadata_v3_MetadataKey_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKey.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -68,6 +74,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = { &envoy_type_metadata_v3_MetadataKind_submsgs[0], &envoy_type_metadata_v3_MetadataKind__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -84,24 +93,36 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init = NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Request", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Route", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Cluster", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Host", +#endif }; static const upb_MiniTable *messages_layout[7] = { diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h index a3fe106c4f..a685a68927 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h @@ -161,11 +161,11 @@ UPB_INLINE bool envoy_type_tracing_v3_CustomTag_has_metadata(const envoy_type_tr UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_tag(envoy_type_tracing_v3_CustomTag *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_literal(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Literal* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_CustomTag_mutable_literal(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Literal* sub = (struct envoy_type_tracing_v3_CustomTag_Literal*)envoy_type_tracing_v3_CustomTag_literal(msg); @@ -177,7 +177,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3 } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_environment(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Environment* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_CustomTag_mutable_environment(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Environment* sub = (struct envoy_type_tracing_v3_CustomTag_Environment*)envoy_type_tracing_v3_CustomTag_environment(msg); @@ -189,7 +189,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracin } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_request_header(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Header* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomTag_mutable_request_header(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Header* sub = (struct envoy_type_tracing_v3_CustomTag_Header*)envoy_type_tracing_v3_CustomTag_request_header(msg); @@ -201,7 +201,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_ } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_metadata(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Metadata* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_CustomTag_mutable_metadata(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Metadata* sub = (struct envoy_type_tracing_v3_CustomTag_Metadata*)envoy_type_tracing_v3_CustomTag_metadata(msg); @@ -263,7 +263,7 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Literal_value(const en UPB_INLINE void envoy_type_tracing_v3_CustomTag_Literal_set_value(envoy_type_tracing_v3_CustomTag_Literal *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Environment */ @@ -329,11 +329,11 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Environment_default_va UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_set_name(envoy_type_tracing_v3_CustomTag_Environment *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_set_default_value(envoy_type_tracing_v3_CustomTag_Environment *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Header */ @@ -399,11 +399,11 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Header_default_value(c UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_set_name(envoy_type_tracing_v3_CustomTag_Header *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_set_default_value(envoy_type_tracing_v3_CustomTag_Header *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Metadata */ @@ -489,7 +489,7 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Metadata_default_value UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_kind(envoy_type_tracing_v3_CustomTag_Metadata *msg, struct envoy_type_metadata_v3_MetadataKind* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_v3_CustomTag_Metadata_mutable_kind(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind* sub = (struct envoy_type_metadata_v3_MetadataKind*)envoy_type_tracing_v3_CustomTag_Metadata_kind(msg); @@ -501,7 +501,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_v3_Cus } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_metadata_key(envoy_type_tracing_v3_CustomTag_Metadata *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v3_CustomTag_Metadata_mutable_metadata_key(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_type_tracing_v3_CustomTag_Metadata_metadata_key(msg); @@ -513,7 +513,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v3_Cust } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_default_value(envoy_type_tracing_v3_CustomTag_Metadata *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c index 2657f28b38..71a72baf89 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = { &envoy_type_tracing_v3_CustomTag_submsgs[0], &envoy_type_tracing_v3_CustomTag__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init = { NULL, &envoy_type_tracing_v3_CustomTag_Literal__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Literal", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -70,6 +76,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init = NULL, &envoy_type_tracing_v3_CustomTag_Environment__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Environment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -87,6 +96,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = { NULL, &envoy_type_tracing_v3_CustomTag_Header__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Header", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -110,6 +122,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init = { &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0], &envoy_type_tracing_v3_CustomTag_Metadata__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Metadata", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h index 7b9e0e2905..784b9ad89e 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h @@ -110,7 +110,7 @@ UPB_INLINE bool envoy_type_v3_HashPolicy_has_filter_state(const envoy_type_v3_Ha UPB_INLINE void envoy_type_v3_HashPolicy_set_source_ip(envoy_type_v3_HashPolicy *msg, envoy_type_v3_HashPolicy_SourceIp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_mutable_source_ip(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) { struct envoy_type_v3_HashPolicy_SourceIp* sub = (struct envoy_type_v3_HashPolicy_SourceIp*)envoy_type_v3_HashPolicy_source_ip(msg); @@ -122,7 +122,7 @@ UPB_INLINE struct envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_mu } UPB_INLINE void envoy_type_v3_HashPolicy_set_filter_state(envoy_type_v3_HashPolicy *msg, envoy_type_v3_HashPolicy_FilterState* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_mutable_filter_state(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) { struct envoy_type_v3_HashPolicy_FilterState* sub = (struct envoy_type_v3_HashPolicy_FilterState*)envoy_type_v3_HashPolicy_filter_state(msg); @@ -222,7 +222,7 @@ UPB_INLINE upb_StringView envoy_type_v3_HashPolicy_FilterState_key(const envoy_t UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_set_key(envoy_type_v3_HashPolicy_FilterState *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c index 8e7b920974..de7bad7194 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = { &envoy_type_v3_HashPolicy_submsgs[0], &envoy_type_v3_HashPolicy__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -41,6 +44,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy.SourceIp", +#endif }; static const upb_MiniTableField envoy_type_v3_HashPolicy_FilterState__fields[1] = { @@ -51,6 +57,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init = { NULL, &envoy_type_v3_HashPolicy_FilterState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy.FilterState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h index f176569aaa..7bba667026 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h @@ -138,7 +138,7 @@ UPB_INLINE int32_t envoy_type_v3_HttpStatus_code(const envoy_type_v3_HttpStatus* UPB_INLINE void envoy_type_v3_HttpStatus_set_code(envoy_type_v3_HttpStatus *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c index d51d8bf552..753271ec95 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__HttpStatus_msg_init = { NULL, &envoy_type_v3_HttpStatus__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HttpStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h index 5080aad6e8..fbc1ccc5dc 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h @@ -85,7 +85,7 @@ UPB_INLINE double envoy_type_v3_Percent_value(const envoy_type_v3_Percent* msg) UPB_INLINE void envoy_type_v3_Percent_set_value(envoy_type_v3_Percent *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.FractionalPercent */ @@ -151,11 +151,11 @@ UPB_INLINE int32_t envoy_type_v3_FractionalPercent_denominator(const envoy_type_ UPB_INLINE void envoy_type_v3_FractionalPercent_set_numerator(envoy_type_v3_FractionalPercent *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_FractionalPercent_set_denominator(envoy_type_v3_FractionalPercent *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c index 719753b93e..b1c326948f 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__Percent_msg_init = { NULL, &envoy_type_v3_Percent__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Percent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -38,6 +41,9 @@ const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init = { NULL, &envoy_type_v3_FractionalPercent__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.FractionalPercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb.h index 9ed48de0c8..497e60a999 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb.h @@ -91,11 +91,11 @@ UPB_INLINE int64_t envoy_type_v3_Int64Range_end(const envoy_type_v3_Int64Range* UPB_INLINE void envoy_type_v3_Int64Range_set_start(envoy_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_Int64Range_set_end(envoy_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.Int32Range */ @@ -161,11 +161,11 @@ UPB_INLINE int32_t envoy_type_v3_Int32Range_end(const envoy_type_v3_Int32Range* UPB_INLINE void envoy_type_v3_Int32Range_set_start(envoy_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_Int32Range_set_end(envoy_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.DoubleRange */ @@ -231,11 +231,11 @@ UPB_INLINE double envoy_type_v3_DoubleRange_end(const envoy_type_v3_DoubleRange* UPB_INLINE void envoy_type_v3_DoubleRange_set_start(envoy_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c index 39c018fc68..9ffc6f5454 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__Int64Range_msg_init = { NULL, &envoy_type_v3_Int64Range__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Int64Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -40,6 +43,9 @@ const upb_MiniTable envoy__type__v3__Int32Range_msg_init = { NULL, &envoy_type_v3_Int32Range__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Int32Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -57,6 +63,9 @@ const upb_MiniTable envoy__type__v3__DoubleRange_msg_init = { NULL, &envoy_type_v3_DoubleRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.DoubleRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h index 939c9182d2..c94e29ac2d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h @@ -134,11 +134,11 @@ UPB_INLINE bool envoy_type_v3_RateLimitStrategy_has_token_bucket(const envoy_typ UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_blanket_rule(envoy_type_v3_RateLimitStrategy *msg, int32_t value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_requests_per_time_unit(envoy_type_v3_RateLimitStrategy *msg, envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_RateLimitStrategy_mutable_requests_per_time_unit(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) { struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* sub = (struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)envoy_type_v3_RateLimitStrategy_requests_per_time_unit(msg); @@ -150,7 +150,7 @@ UPB_INLINE struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_typ } UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_token_bucket(envoy_type_v3_RateLimitStrategy *msg, struct envoy_type_v3_TokenBucket* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_TokenBucket* envoy_type_v3_RateLimitStrategy_mutable_token_bucket(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) { struct envoy_type_v3_TokenBucket* sub = (struct envoy_type_v3_TokenBucket*)envoy_type_v3_RateLimitStrategy_token_bucket(msg); @@ -224,11 +224,11 @@ UPB_INLINE int32_t envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_time_unit UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_requests_per_time_unit(envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit *msg, uint64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_time_unit(envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c index 229ad57279..9b1b35c1f6 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = { &envoy_type_v3_RateLimitStrategy_submsgs[0], &envoy_type_v3_RateLimitStrategy__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.RateLimitStrategy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_ NULL, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.RateLimitStrategy.RequestsPerTimeUnit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h index 224636031d..704ae97196 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h @@ -101,15 +101,15 @@ UPB_INLINE uint32_t envoy_type_v3_SemanticVersion_patch(const envoy_type_v3_Sema UPB_INLINE void envoy_type_v3_SemanticVersion_set_major_number(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_SemanticVersion_set_minor_number(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_SemanticVersion_set_patch(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c index 6af83230d0..923ec89a45 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__type__v3__SemanticVersion_msg_init = { NULL, &envoy_type_v3_SemanticVersion__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.SemanticVersion", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h index 21f1706af5..24696afb70 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h @@ -114,11 +114,11 @@ UPB_INLINE bool envoy_type_v3_TokenBucket_has_fill_interval(const envoy_type_v3_ UPB_INLINE void envoy_type_v3_TokenBucket_set_max_tokens(envoy_type_v3_TokenBucket *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_TokenBucket_set_tokens_per_fill(envoy_type_v3_TokenBucket *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_mutable_tokens_per_fill(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_v3_TokenBucket_tokens_per_fill(msg); @@ -130,7 +130,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_mutable } UPB_INLINE void envoy_type_v3_TokenBucket_set_fill_interval(envoy_type_v3_TokenBucket *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_type_v3_TokenBucket_mutable_fill_interval(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_v3_TokenBucket_fill_interval(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c index 390a13684d..dcfe1e086d 100644 --- a/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = { &envoy_type_v3_TokenBucket_submsgs[0], &envoy_type_v3_TokenBucket__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.TokenBucket", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/annotations.upb.h b/deps/grpc/src/core/ext/upb-gen/google/api/annotations.upb.h index 68316455fe..681baa3335 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/annotations.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/annotations.upb.h @@ -46,9 +46,18 @@ UPB_INLINE void google_api_set_http(struct google_protobuf_MethodOptions* msg, c UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct google_api_HttpRule* google_api_mutable_http(struct google_protobuf_MethodOptions* msg, + upb_Arena* arena) { + struct google_api_HttpRule* sub = (struct google_api_HttpRule*)google_api_http(msg); + if (sub == NULL) { + sub = (struct google_api_HttpRule*)_upb_Message_New(&google__api__HttpRule_msg_init, arena); + if (sub) google_api_set_http(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h index 26012012e9..3b87f262b9 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h @@ -186,6 +186,18 @@ UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_has_source_info(const googl const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_clear_expr_version(google_api_expr_v1alpha1_CheckedExpr* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView google_api_expr_v1alpha1_CheckedExpr_expr_version(const google_api_expr_v1alpha1_CheckedExpr* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_reference_map_clear(google_api_expr_v1alpha1_CheckedExpr* msg) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -239,7 +251,7 @@ UPB_INLINE google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_expr(google_api_expr_v1alpha1_CheckedExpr *msg, struct google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_CheckedExpr_mutable_expr(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_CheckedExpr_expr(msg); @@ -251,7 +263,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Checke } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_source_info(google_api_expr_v1alpha1_CheckedExpr *msg, struct google_api_expr_v1alpha1_SourceInfo* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_CheckedExpr_mutable_source_info(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_CheckedExpr_source_info(msg); @@ -261,6 +273,10 @@ UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_ } return sub; } +UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_expr_version(google_api_expr_v1alpha1_CheckedExpr *msg, upb_StringView value) { + const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* google.api.expr.v1alpha1.CheckedExpr.ReferenceMapEntry */ @@ -572,7 +588,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_has_abstract_type(const google_api UPB_INLINE void google_api_expr_v1alpha1_Type_set_dyn(google_api_expr_v1alpha1_Type *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_dyn(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_dyn(msg); @@ -584,23 +600,23 @@ UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_d } UPB_INLINE void google_api_expr_v1alpha1_Type_set_null(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_primitive(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_wrapper(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_well_known(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_list_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_ListType* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type_mutable_list_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_ListType* sub = (struct google_api_expr_v1alpha1_Type_ListType*)google_api_expr_v1alpha1_Type_list_type(msg); @@ -612,7 +628,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alph } UPB_INLINE void google_api_expr_v1alpha1_Type_set_map_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_MapType* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_mutable_map_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_MapType* sub = (struct google_api_expr_v1alpha1_Type_MapType*)google_api_expr_v1alpha1_Type_map_type(msg); @@ -624,7 +640,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha } UPB_INLINE void google_api_expr_v1alpha1_Type_set_function(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_FunctionType* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_Type_mutable_function(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_FunctionType* sub = (struct google_api_expr_v1alpha1_Type_FunctionType*)google_api_expr_v1alpha1_Type_function(msg); @@ -636,15 +652,15 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_Type_set_message_type(google_api_expr_v1alpha1_Type *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_type_param(google_api_expr_v1alpha1_Type *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_mutable_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_type(msg); @@ -656,7 +672,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_m } UPB_INLINE void google_api_expr_v1alpha1_Type_set_error(google_api_expr_v1alpha1_Type *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_error(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_error(msg); @@ -668,7 +684,7 @@ UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_e } UPB_INLINE void google_api_expr_v1alpha1_Type_set_abstract_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_AbstractType* value) { const upb_MiniTableField field = {14, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_Type_mutable_abstract_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_AbstractType* sub = (struct google_api_expr_v1alpha1_Type_AbstractType*)google_api_expr_v1alpha1_Type_abstract_type(msg); @@ -734,7 +750,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_ListType_has_elem_type(const googl UPB_INLINE void google_api_expr_v1alpha1_Type_ListType_set_elem_type(google_api_expr_v1alpha1_Type_ListType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_ListType_mutable_elem_type(google_api_expr_v1alpha1_Type_ListType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_ListType_elem_type(msg); @@ -816,7 +832,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_MapType_has_value_type(const googl UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_key_type(google_api_expr_v1alpha1_Type_MapType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_key_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_key_type(msg); @@ -828,7 +844,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_M } UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_value_type(google_api_expr_v1alpha1_Type_MapType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_value_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_value_type(msg); @@ -926,7 +942,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_FunctionType_arg_types_muta UPB_INLINE void google_api_expr_v1alpha1_Type_FunctionType_set_result_type(google_api_expr_v1alpha1_Type_FunctionType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_FunctionType_mutable_result_type(google_api_expr_v1alpha1_Type_FunctionType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_FunctionType_result_type(msg); @@ -1050,7 +1066,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_AbstractType_parameter_type UPB_INLINE void google_api_expr_v1alpha1_Type_AbstractType_set_name(google_api_expr_v1alpha1_Type_AbstractType *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Type_AbstractType_mutable_parameter_types(google_api_expr_v1alpha1_Type_AbstractType* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1176,11 +1192,11 @@ UPB_INLINE bool google_api_expr_v1alpha1_Decl_has_function(const google_api_expr UPB_INLINE void google_api_expr_v1alpha1_Decl_set_name(google_api_expr_v1alpha1_Decl *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Decl_set_ident(google_api_expr_v1alpha1_Decl *msg, google_api_expr_v1alpha1_Decl_IdentDecl* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Decl_mutable_ident(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Decl_IdentDecl* sub = (struct google_api_expr_v1alpha1_Decl_IdentDecl*)google_api_expr_v1alpha1_Decl_ident(msg); @@ -1192,7 +1208,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alp } UPB_INLINE void google_api_expr_v1alpha1_Decl_set_function(google_api_expr_v1alpha1_Decl *msg, google_api_expr_v1alpha1_Decl_FunctionDecl* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_Decl_mutable_function(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Decl_FunctionDecl* sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl*)google_api_expr_v1alpha1_Decl_function(msg); @@ -1286,7 +1302,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Decl_IdentDecl_doc(const goog UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_type(google_api_expr_v1alpha1_Decl_IdentDecl *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_type(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_IdentDecl_type(msg); @@ -1298,7 +1314,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_I } UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_value(google_api_expr_v1alpha1_Decl_IdentDecl *msg, struct google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_value(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Decl_IdentDecl_value(msg); @@ -1310,7 +1326,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_De } UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_doc(google_api_expr_v1alpha1_Decl_IdentDecl *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Decl.FunctionDecl */ @@ -1568,7 +1584,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_do UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_overload_id(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_mutable_params(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1630,7 +1646,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_add_type_par } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_result_type(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_mutable_result_type(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_result_type(msg); @@ -1642,11 +1658,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_F } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_is_instance_function(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_doc(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Reference */ @@ -1748,7 +1764,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Reference_has_value(const google_api_ex UPB_INLINE void google_api_expr_v1alpha1_Reference_set_name(google_api_expr_v1alpha1_Reference *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_api_expr_v1alpha1_Reference_mutable_overload_id(google_api_expr_v1alpha1_Reference* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1780,7 +1796,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Reference_add_overload_id(google_api_ex } UPB_INLINE void google_api_expr_v1alpha1_Reference_set_value(google_api_expr_v1alpha1_Reference *msg, struct google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Reference_mutable_value(google_api_expr_v1alpha1_Reference* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Reference_value(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c index 2b96e30985..a9296e36e9 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c @@ -22,17 +22,31 @@ static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init}, }; -static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[4] = { +static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[5] = { {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = { &google_api_expr_v1alpha1_CheckedExpr_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr__fields[0], - UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003000003f000032, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) }; static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { @@ -48,6 +62,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_ &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr.ReferenceMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -67,6 +84,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_i &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr.TypeMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -103,6 +123,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = { &google_api_expr_v1alpha1_Type_submsgs[0], &google_api_expr_v1alpha1_Type__fields[0], UPB_SIZE(24, 32), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -135,6 +158,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = { &google_api_expr_v1alpha1_Type_ListType_submsgs[0], &google_api_expr_v1alpha1_Type_ListType__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.ListType", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Type_MapType_submsgs[2] = { @@ -151,6 +177,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = { &google_api_expr_v1alpha1_Type_MapType_submsgs[0], &google_api_expr_v1alpha1_Type_MapType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.MapType", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = { @@ -167,6 +196,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = { &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0], &google_api_expr_v1alpha1_Type_FunctionType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.FunctionType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -188,6 +220,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = { &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0], &google_api_expr_v1alpha1_Type_AbstractType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.AbstractType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -211,6 +246,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = { &google_api_expr_v1alpha1_Decl_submsgs[0], &google_api_expr_v1alpha1_Decl__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -234,6 +272,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = { &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_IdentDecl__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.IdentDecl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -254,6 +295,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = { &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.FunctionDecl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -278,6 +322,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_ms &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.FunctionDecl.Overload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -304,6 +351,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = { &google_api_expr_v1alpha1_Reference_submsgs[0], &google_api_expr_v1alpha1_Reference__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Reference", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h index 58dc06daf9..c7ff866228 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h @@ -34,12 +34,21 @@ typedef struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry { upb_Message UP typedef struct google_api_expr_v1alpha1_Expr_Comprehension { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_Expr_Comprehension; typedef struct google_api_expr_v1alpha1_Constant { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_Constant; typedef struct google_api_expr_v1alpha1_SourceInfo { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourceInfo; +typedef struct google_api_expr_v1alpha1_SourceInfo_Extension { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourceInfo_Extension; +typedef struct google_api_expr_v1alpha1_SourceInfo_Extension_Version { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourceInfo_Extension_Version; typedef struct google_api_expr_v1alpha1_SourceInfo_PositionsEntry { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourceInfo_PositionsEntry; typedef struct google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry; typedef struct google_api_expr_v1alpha1_SourcePosition { upb_Message UPB_PRIVATE(base); } google_api_expr_v1alpha1_SourcePosition; struct google_protobuf_Duration; struct google_protobuf_Timestamp; +typedef enum { + google_api_expr_v1alpha1_SourceInfo_Extension_COMPONENT_UNSPECIFIED = 0, + google_api_expr_v1alpha1_SourceInfo_Extension_COMPONENT_PARSER = 1, + google_api_expr_v1alpha1_SourceInfo_Extension_COMPONENT_TYPE_CHECKER = 2, + google_api_expr_v1alpha1_SourceInfo_Extension_COMPONENT_RUNTIME = 3 +} google_api_expr_v1alpha1_SourceInfo_Extension_Component; + /* google.api.expr.v1alpha1.ParsedExpr */ @@ -113,7 +122,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_ParsedExpr_has_source_info(const google UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_expr(google_api_expr_v1alpha1_ParsedExpr *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_ParsedExpr_mutable_expr(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_ParsedExpr_expr(msg); @@ -125,7 +134,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Parsed } UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_source_info(google_api_expr_v1alpha1_ParsedExpr *msg, google_api_expr_v1alpha1_SourceInfo* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_ParsedExpr_mutable_source_info(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_ParsedExpr_source_info(msg); @@ -314,11 +323,11 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_has_comprehension_expr(const googl UPB_INLINE void google_api_expr_v1alpha1_Expr_set_id(google_api_expr_v1alpha1_Expr *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_const_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 24), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Expr_mutable_const_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Expr_const_expr(msg); @@ -330,7 +339,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Ex } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_ident_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Ident* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 24), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_mutable_ident_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Ident* sub = (struct google_api_expr_v1alpha1_Expr_Ident*)google_api_expr_v1alpha1_Expr_ident_expr(msg); @@ -342,7 +351,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_ } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_select_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Select* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 24), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_mutable_select_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Select* sub = (struct google_api_expr_v1alpha1_Expr_Select*)google_api_expr_v1alpha1_Expr_select_expr(msg); @@ -354,7 +363,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1 } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_call_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Call* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 24), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_mutable_call_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Call* sub = (struct google_api_expr_v1alpha1_Expr_Call*)google_api_expr_v1alpha1_Expr_call_expr(msg); @@ -366,7 +375,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_E } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_list_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_CreateList* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 24), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Expr_mutable_list_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_CreateList* sub = (struct google_api_expr_v1alpha1_Expr_CreateList*)google_api_expr_v1alpha1_Expr_list_expr(msg); @@ -378,7 +387,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1al } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_struct_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_CreateStruct* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 24), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_Expr_mutable_struct_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_CreateStruct* sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct*)google_api_expr_v1alpha1_Expr_struct_expr(msg); @@ -390,7 +399,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_comprehension_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Comprehension* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 24), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1_Expr_mutable_comprehension_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Comprehension* sub = (struct google_api_expr_v1alpha1_Expr_Comprehension*)google_api_expr_v1alpha1_Expr_comprehension_expr(msg); @@ -452,7 +461,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Expr_Ident_name(const google_ UPB_INLINE void google_api_expr_v1alpha1_Expr_Ident_set_name(google_api_expr_v1alpha1_Expr_Ident *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Expr.Select */ @@ -534,7 +543,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_Select_test_only(const google_api_ UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_operand(google_api_expr_v1alpha1_Expr_Select *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Select_mutable_operand(google_api_expr_v1alpha1_Expr_Select* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Select_operand(msg); @@ -546,11 +555,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_S } UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_field(google_api_expr_v1alpha1_Expr_Select *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_test_only(google_api_expr_v1alpha1_Expr_Select *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Expr.Call */ @@ -652,7 +661,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_Call_args_mutable_upb_array UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_target(google_api_expr_v1alpha1_Expr_Call *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Call_mutable_target(google_api_expr_v1alpha1_Expr_Call* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Call_target(msg); @@ -664,7 +673,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_function(google_api_expr_v1alpha1_Expr_Call *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Expr** google_api_expr_v1alpha1_Expr_Call_mutable_args(google_api_expr_v1alpha1_Expr_Call* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -765,6 +774,38 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_elements_mutable } return arr; } +UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateList_clear_optional_indices(google_api_expr_v1alpha1_Expr_CreateList* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t const* google_api_expr_v1alpha1_Expr_CreateList_optional_indices(const google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (int32_t const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_optional_indices_upb_array(const google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_optional_indices_mutable_upb_array(google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} UPB_INLINE google_api_expr_v1alpha1_Expr** google_api_expr_v1alpha1_Expr_CreateList_mutable_elements(google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -796,6 +837,34 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE int32_t* google_api_expr_v1alpha1_Expr_CreateList_mutable_optional_indices(google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { + upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (int32_t*)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE int32_t* google_api_expr_v1alpha1_Expr_CreateList_resize_optional_indices(google_api_expr_v1alpha1_Expr_CreateList* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateList_add_optional_indices(google_api_expr_v1alpha1_Expr_CreateList* msg, int32_t val, upb_Arena* arena) { + upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return false; + } + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); + return true; +} /* google.api.expr.v1alpha1.Expr.CreateStruct */ @@ -880,7 +949,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateStruct_entries_mutabl UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_set_message_name(google_api_expr_v1alpha1_Expr_CreateStruct *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry** google_api_expr_v1alpha1_Expr_CreateStruct_mutable_entries(google_api_expr_v1alpha1_Expr_CreateStruct* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -955,82 +1024,94 @@ typedef enum { google_api_expr_v1alpha1_Expr_CreateStruct_Entry_key_kind_NOT_SET = 0 } google_api_expr_v1alpha1_Expr_CreateStruct_Entry_key_kind_oneofcases; UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry_key_kind_oneofcases google_api_expr_v1alpha1_Expr_CreateStruct_Entry_key_kind_case(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return (google_api_expr_v1alpha1_Expr_CreateStruct_Entry_key_kind_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_clear_id(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {1, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(32, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int64_t google_api_expr_v1alpha1_Expr_CreateStruct_Entry_id(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { int64_t default_val = (int64_t)0ll; int64_t ret; - const upb_MiniTableField field = {1, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(32, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_clear_field_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_api_expr_v1alpha1_Expr_CreateStruct_Entry_field_key(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateStruct_Entry_has_field_key(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_clear_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_map_key(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; - const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateStruct_Entry_has_map_key(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_clear_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_value(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; - const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateStruct_Entry_has_value(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_clear_optional_entry(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateStruct_Entry_optional_entry(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_id(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, int64_t value) { - const upb_MiniTableField field = {1, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(32, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_field_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, google_api_expr_v1alpha1_Expr* value) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_map_key(msg); @@ -1041,8 +1122,8 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C return sub; } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, google_api_expr_v1alpha1_Expr* value) { - const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_value(msg); @@ -1052,6 +1133,10 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } return sub; } +UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_optional_entry(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, bool value) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* google.api.expr.v1alpha1.Expr.Comprehension */ @@ -1193,14 +1278,26 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_Comprehension_has_result(const goo const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_clear_iter_var2(google_api_expr_v1alpha1_Expr_Comprehension* msg) { + const upb_MiniTableField field = {8, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView google_api_expr_v1alpha1_Expr_Comprehension_iter_var2(const google_api_expr_v1alpha1_Expr_Comprehension* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {8, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_var(google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_range(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_iter_range(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_iter_range(msg); @@ -1212,11 +1309,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_var(google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_StringView value) { const upb_MiniTableField field = {3, 40, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_init(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_accu_init(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_accu_init(msg); @@ -1228,7 +1325,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_condition(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_condition(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_condition(msg); @@ -1240,7 +1337,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_step(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_step(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_step(msg); @@ -1252,7 +1349,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_result(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_result(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_result(msg); @@ -1262,6 +1359,10 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } return sub; } +UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_var2(google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_StringView value) { + const upb_MiniTableField field = {8, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* google.api.expr.v1alpha1.Constant */ @@ -1463,35 +1564,35 @@ UPB_INLINE bool google_api_expr_v1alpha1_Constant_has_timestamp_value(const goog UPB_INLINE void google_api_expr_v1alpha1_Constant_set_null_value(google_api_expr_v1alpha1_Constant *msg, int32_t value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_bool_value(google_api_expr_v1alpha1_Constant *msg, bool value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_int64_value(google_api_expr_v1alpha1_Constant *msg, int64_t value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_uint64_value(google_api_expr_v1alpha1_Constant *msg, uint64_t value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_double_value(google_api_expr_v1alpha1_Constant *msg, double value) { const upb_MiniTableField field = {5, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_string_value(google_api_expr_v1alpha1_Constant *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_bytes_value(google_api_expr_v1alpha1_Constant *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_duration_value(google_api_expr_v1alpha1_Constant *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* google_api_expr_v1alpha1_Constant_mutable_duration_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)google_api_expr_v1alpha1_Constant_duration_value(msg); @@ -1503,7 +1604,7 @@ UPB_INLINE struct google_protobuf_Duration* google_api_expr_v1alpha1_Constant_mu } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_timestamp_value(google_api_expr_v1alpha1_Constant *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {9, 16, -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* google_api_expr_v1alpha1_Constant_mutable_timestamp_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)google_api_expr_v1alpha1_Constant_timestamp_value(msg); @@ -1551,25 +1652,25 @@ UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_serialize_ex(const google_a return ptr; } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_syntax_version(google_api_expr_v1alpha1_SourceInfo* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_api_expr_v1alpha1_SourceInfo_syntax_version(const google_api_expr_v1alpha1_SourceInfo* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_location(google_api_expr_v1alpha1_SourceInfo* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_api_expr_v1alpha1_SourceInfo_location(const google_api_expr_v1alpha1_SourceInfo* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1664,14 +1765,46 @@ UPB_INLINE upb_Map* _google_api_expr_v1alpha1_SourceInfo_macro_calls_mutable_upb const upb_MiniTableField field = {5, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(int64_t), sizeof(google_api_expr_v1alpha1_Expr*), a); } +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_extensions(google_api_expr_v1alpha1_SourceInfo* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_Extension* const* google_api_expr_v1alpha1_SourceInfo_extensions(const google_api_expr_v1alpha1_SourceInfo* msg, size_t* size) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (const google_api_expr_v1alpha1_SourceInfo_Extension* const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_SourceInfo_extensions_upb_array(const google_api_expr_v1alpha1_SourceInfo* msg, size_t* size) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _google_api_expr_v1alpha1_SourceInfo_extensions_mutable_upb_array(google_api_expr_v1alpha1_SourceInfo* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_set_syntax_version(google_api_expr_v1alpha1_SourceInfo *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_set_location(google_api_expr_v1alpha1_SourceInfo *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* google_api_expr_v1alpha1_SourceInfo_mutable_line_offsets(google_api_expr_v1alpha1_SourceInfo* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1751,6 +1884,248 @@ UPB_INLINE google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry* google_api_expr_ if (!map) return NULL; return (google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry*)_upb_map_next(map, iter); } +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension** google_api_expr_v1alpha1_SourceInfo_mutable_extensions(google_api_expr_v1alpha1_SourceInfo* msg, size_t* size) { + upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (google_api_expr_v1alpha1_SourceInfo_Extension**)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension** google_api_expr_v1alpha1_SourceInfo_resize_extensions(google_api_expr_v1alpha1_SourceInfo* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (google_api_expr_v1alpha1_SourceInfo_Extension**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo_Extension* google_api_expr_v1alpha1_SourceInfo_add_extensions(google_api_expr_v1alpha1_SourceInfo* msg, upb_Arena* arena) { + upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return NULL; + } + struct google_api_expr_v1alpha1_SourceInfo_Extension* sub = (struct google_api_expr_v1alpha1_SourceInfo_Extension*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, arena); + if (!arr || !sub) return NULL; + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); + return sub; +} + +/* google.api.expr.v1alpha1.SourceInfo.Extension */ + +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension* google_api_expr_v1alpha1_SourceInfo_Extension_new(upb_Arena* arena) { + return (google_api_expr_v1alpha1_SourceInfo_Extension*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, arena); +} +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension* google_api_expr_v1alpha1_SourceInfo_Extension_parse(const char* buf, size_t size, upb_Arena* arena) { + google_api_expr_v1alpha1_SourceInfo_Extension* ret = google_api_expr_v1alpha1_SourceInfo_Extension_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension* google_api_expr_v1alpha1_SourceInfo_Extension_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + google_api_expr_v1alpha1_SourceInfo_Extension* ret = google_api_expr_v1alpha1_SourceInfo_Extension_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_Extension_serialize(const google_api_expr_v1alpha1_SourceInfo_Extension* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_Extension_serialize_ex(const google_api_expr_v1alpha1_SourceInfo_Extension* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_clear_id(google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView google_api_expr_v1alpha1_SourceInfo_Extension_id(const google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_clear_affected_components(google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t const* google_api_expr_v1alpha1_SourceInfo_Extension_affected_components(const google_api_expr_v1alpha1_SourceInfo_Extension* msg, size_t* size) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (int32_t const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_SourceInfo_Extension_affected_components_upb_array(const google_api_expr_v1alpha1_SourceInfo_Extension* msg, size_t* size) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _google_api_expr_v1alpha1_SourceInfo_Extension_affected_components_mutable_upb_array(google_api_expr_v1alpha1_SourceInfo_Extension* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_clear_version(google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_api_expr_v1alpha1_SourceInfo_Extension_version(const google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + const google_api_expr_v1alpha1_SourceInfo_Extension_Version* default_val = NULL; + const google_api_expr_v1alpha1_SourceInfo_Extension_Version* ret; + const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_Extension_has_version(const google_api_expr_v1alpha1_SourceInfo_Extension* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_set_id(google_api_expr_v1alpha1_SourceInfo_Extension *msg, upb_StringView value) { + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE int32_t* google_api_expr_v1alpha1_SourceInfo_Extension_mutable_affected_components(google_api_expr_v1alpha1_SourceInfo_Extension* msg, size_t* size) { + upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (int32_t*)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE int32_t* google_api_expr_v1alpha1_SourceInfo_Extension_resize_affected_components(google_api_expr_v1alpha1_SourceInfo_Extension* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_Extension_add_affected_components(google_api_expr_v1alpha1_SourceInfo_Extension* msg, int32_t val, upb_Arena* arena) { + upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return false; + } + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); + return true; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_set_version(google_api_expr_v1alpha1_SourceInfo_Extension *msg, google_api_expr_v1alpha1_SourceInfo_Extension_Version* value) { + const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_api_expr_v1alpha1_SourceInfo_Extension_mutable_version(google_api_expr_v1alpha1_SourceInfo_Extension* msg, upb_Arena* arena) { + struct google_api_expr_v1alpha1_SourceInfo_Extension_Version* sub = (struct google_api_expr_v1alpha1_SourceInfo_Extension_Version*)google_api_expr_v1alpha1_SourceInfo_Extension_version(msg); + if (sub == NULL) { + sub = (struct google_api_expr_v1alpha1_SourceInfo_Extension_Version*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, arena); + if (sub) google_api_expr_v1alpha1_SourceInfo_Extension_set_version(msg, sub); + } + return sub; +} + +/* google.api.expr.v1alpha1.SourceInfo.Extension.Version */ + +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_api_expr_v1alpha1_SourceInfo_Extension_Version_new(upb_Arena* arena) { + return (google_api_expr_v1alpha1_SourceInfo_Extension_Version*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, arena); +} +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_api_expr_v1alpha1_SourceInfo_Extension_Version_parse(const char* buf, size_t size, upb_Arena* arena) { + google_api_expr_v1alpha1_SourceInfo_Extension_Version* ret = google_api_expr_v1alpha1_SourceInfo_Extension_Version_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_api_expr_v1alpha1_SourceInfo_Extension_Version_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + google_api_expr_v1alpha1_SourceInfo_Extension_Version* ret = google_api_expr_v1alpha1_SourceInfo_Extension_Version_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_Extension_Version_serialize(const google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_Extension_Version_serialize_ex(const google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_Version_clear_major(google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int64_t google_api_expr_v1alpha1_SourceInfo_Extension_Version_major(const google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg) { + int64_t default_val = (int64_t)0ll; + int64_t ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_Version_clear_minor(google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int64_t google_api_expr_v1alpha1_SourceInfo_Extension_Version_minor(const google_api_expr_v1alpha1_SourceInfo_Extension_Version* msg) { + int64_t default_val = (int64_t)0ll; + int64_t ret; + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_Version_set_major(google_api_expr_v1alpha1_SourceInfo_Extension_Version *msg, int64_t value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_Extension_Version_set_minor(google_api_expr_v1alpha1_SourceInfo_Extension_Version *msg, int64_t value) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* google.api.expr.v1alpha1.SourceInfo.PositionsEntry */ @@ -1877,19 +2252,19 @@ UPB_INLINE int32_t google_api_expr_v1alpha1_SourcePosition_column(const google_a UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_location(google_api_expr_v1alpha1_SourcePosition *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_offset(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_line(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_column(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c index 46d54904c0..86de1318a5 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = { &google_api_expr_v1alpha1_ParsedExpr_submsgs[0], &google_api_expr_v1alpha1_ParsedExpr__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.ParsedExpr", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_submsgs[7] = { @@ -56,6 +59,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = { &google_api_expr_v1alpha1_Expr_submsgs[0], &google_api_expr_v1alpha1_Expr__fields[0], UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -84,6 +90,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = { NULL, &google_api_expr_v1alpha1_Expr_Ident__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Ident", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -104,6 +113,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = { &google_api_expr_v1alpha1_Expr_Select_submsgs[0], &google_api_expr_v1alpha1_Expr_Select__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Select", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -127,6 +139,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = { &google_api_expr_v1alpha1_Expr_Call_submsgs[0], &google_api_expr_v1alpha1_Expr_Call__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Call", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -139,17 +154,23 @@ static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateList_submsgs[1 {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, }; -static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields[1] = { +static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields[2] = { {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = { &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateList__fields[0], - 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, + UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, + {0x001000003f000012, &upb_ppv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -166,6 +187,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = { &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateStruct", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -179,22 +203,30 @@ static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_Entry_s {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, }; -static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[4] = { - {1, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[5] = { + {1, UPB_SIZE(32, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, 24, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init = { &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0], - UPB_SIZE(40, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateStruct.Entry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x002000003f000008, &upb_psv8_1bt}, - {0x0010000c02000012, &upb_pos_1bt}, - {0x0010000c0300001a, &upb_pom_1bt_max64b}, + {0x002800003f000008, &upb_psv8_1bt}, + {0x0018000c02000012, &upb_pos_1bt}, + {0x0018000c0300001a, &upb_pom_1bt_max64b}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f000028, &upb_psb1_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -206,7 +238,7 @@ static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Comprehension_submsg {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, }; -static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fields[7] = { +static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fields[8] = { {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, 40, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -214,17 +246,33 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fie {5, UPB_SIZE(20, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(24, 72), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(28, 80), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = { &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0], &google_api_expr_v1alpha1_Expr_Comprehension__fields[0], - UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Comprehension", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002800003f00001a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x005800003f000042, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -249,6 +297,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { &google_api_expr_v1alpha1_Constant_submsgs[0], &google_api_expr_v1alpha1_Constant__fields[0], UPB_SIZE(24, 32), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Constant", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -269,28 +320,82 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_submsgs[2] = { +static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init}, }; -static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[5] = { - {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[6] = { + {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(8, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = { &google_api_expr_v1alpha1_SourceInfo_submsgs[0], &google_api_expr_v1alpha1_SourceInfo__fields[0], - UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, {0x001800003f000012, &upb_pss_1bt}, {0x002800003f00001a, &upb_ppv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x004000003f020032, &upb_prm_1bt_max64b}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init}, +}; + +static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_Extension__fields[3] = { + {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init = { + &google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[0], + &google_api_expr_v1alpha1_SourceInfo_Extension__fields[0], + UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.Extension", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x002000003f000012, &upb_ppv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_Extension_Version__fields[2] = { + {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init = { + NULL, + &google_api_expr_v1alpha1_SourceInfo_Extension_Version__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.Extension.Version", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f000008, &upb_psv8_1bt}, + {0x001000003f000010, &upb_psv8_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -303,6 +408,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_ NULL, &google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.PositionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -324,6 +432,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0], &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.MacroCallsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -341,6 +452,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init = { NULL, &google_api_expr_v1alpha1_SourcePosition__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourcePosition", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -353,7 +467,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init = { }) }; -static const upb_MiniTable *messages_layout[14] = { +static const upb_MiniTable *messages_layout[16] = { &google__api__expr__v1alpha1__ParsedExpr_msg_init, &google__api__expr__v1alpha1__Expr_msg_init, &google__api__expr__v1alpha1__Expr__Ident_msg_init, @@ -365,6 +479,8 @@ static const upb_MiniTable *messages_layout[14] = { &google__api__expr__v1alpha1__Expr__Comprehension_msg_init, &google__api__expr__v1alpha1__Constant_msg_init, &google__api__expr__v1alpha1__SourceInfo_msg_init, + &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init, + &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init, &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init, &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init, &google__api__expr__v1alpha1__SourcePosition_msg_init, @@ -374,7 +490,7 @@ const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout = messages_layout, NULL, NULL, - 14, + 16, 0, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h index c0232345d2..269a82c1a3 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h @@ -28,6 +28,8 @@ extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entr extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init; extern const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init; +extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init; +extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init; extern const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init; diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/http.upb.h b/deps/grpc/src/core/ext/upb-gen/google/api/http.upb.h index d7054cab6a..fd9e2bac99 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/http.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/http.upb.h @@ -138,7 +138,7 @@ UPB_INLINE struct google_api_HttpRule* google_api_Http_add_rules(google_api_Http } UPB_INLINE void google_api_Http_set_fully_decode_reserved_expansion(google_api_Http *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.HttpRule */ @@ -358,35 +358,35 @@ UPB_INLINE upb_StringView google_api_HttpRule_response_body(const google_api_Htt UPB_INLINE void google_api_HttpRule_set_selector(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_get(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_put(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_post(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_delete(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {5, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_patch(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_body(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_custom(google_api_HttpRule *msg, google_api_CustomHttpPattern* value) { const upb_MiniTableField field = {8, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_CustomHttpPattern* google_api_HttpRule_mutable_custom(google_api_HttpRule* msg, upb_Arena* arena) { struct google_api_CustomHttpPattern* sub = (struct google_api_CustomHttpPattern*)google_api_HttpRule_custom(msg); @@ -428,7 +428,7 @@ UPB_INLINE struct google_api_HttpRule* google_api_HttpRule_add_additional_bindin } UPB_INLINE void google_api_HttpRule_set_response_body(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.CustomHttpPattern */ @@ -494,11 +494,11 @@ UPB_INLINE upb_StringView google_api_CustomHttpPattern_path(const google_api_Cus UPB_INLINE void google_api_CustomHttpPattern_set_kind(google_api_CustomHttpPattern *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPattern *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/http.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/api/http.upb_minitable.c index f90f5a7782..e74f38d28c 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/http.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/api/http.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable google__api__Http_msg_init = { &google_api_Http_submsgs[0], &google_api_Http__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.Http", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max128b}, @@ -55,6 +58,9 @@ const upb_MiniTable google__api__HttpRule_msg_init = { &google_api_HttpRule_submsgs[0], &google_api_HttpRule__fields[0], UPB_SIZE(48, 88), 10, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.HttpRule", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -84,6 +90,9 @@ const upb_MiniTable google__api__CustomHttpPattern_msg_init = { NULL, &google_api_CustomHttpPattern__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.CustomHttpPattern", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb.h b/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb.h index 188e53c39d..72e122a63a 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb.h @@ -121,11 +121,11 @@ UPB_INLINE upb_Array* _google_api_HttpBody_extensions_mutable_upb_array(google_a UPB_INLINE void google_api_HttpBody_set_content_type(google_api_HttpBody *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpBody_set_data(google_api_HttpBody *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** google_api_HttpBody_mutable_extensions(google_api_HttpBody* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c index d3be877f36..50bf37c9af 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable google__api__HttpBody_msg_init = { &google_api_HttpBody_submsgs[0], &google_api_HttpBody__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.HttpBody", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb.h index e107bccff8..0d50f0afc5 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb.h @@ -86,11 +86,11 @@ UPB_INLINE upb_StringView google_protobuf_Any_value(const google_protobuf_Any* m UPB_INLINE void google_protobuf_Any_set_type_url(google_protobuf_Any *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Any_set_value(google_protobuf_Any *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c index 8caab6bef9..9b0d3c38e5 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Any_msg_init = { NULL, &google_protobuf_Any__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Any", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h index d7c7870318..d2a8801415 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h @@ -37,6 +37,7 @@ typedef struct google_protobuf_FileOptions { upb_Message UPB_PRIVATE(base); } go typedef struct google_protobuf_MessageOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_MessageOptions; typedef struct google_protobuf_FieldOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions; typedef struct google_protobuf_FieldOptions_EditionDefault { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions_EditionDefault; +typedef struct google_protobuf_FieldOptions_FeatureSupport { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions_FeatureSupport; typedef struct google_protobuf_OneofOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_OneofOptions; typedef struct google_protobuf_EnumOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumOptions; typedef struct google_protobuf_EnumValueOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumValueOptions; @@ -56,6 +57,7 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, + google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, @@ -645,11 +647,11 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_pro UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(60, 32), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -801,7 +803,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDesc } UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg); @@ -813,7 +815,7 @@ UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorPro } UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 96), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg); @@ -881,11 +883,11 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_p } UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(68, 120), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 12), 69, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.DescriptorProto */ @@ -1215,7 +1217,7 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1369,7 +1371,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 65, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg); @@ -1555,15 +1557,15 @@ UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) { struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg); @@ -1645,11 +1647,11 @@ UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const goog UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.ExtensionRangeOptions */ @@ -1817,11 +1819,11 @@ UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_prot } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {50, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg); @@ -1981,23 +1983,23 @@ UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(c UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = {5, 16, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = {6, 17, 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FieldDescriptorProto */ @@ -2215,35 +2217,35 @@ UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const g UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 48), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {4, 16, 67, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {5, 20, 68, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(52, 64), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(60, 80), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(24, 96), 71, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg); @@ -2255,15 +2257,15 @@ UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorP } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 24), 72, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(68, 104), 73, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(32, 28), 74, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofDescriptorProto */ @@ -2337,11 +2339,11 @@ UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_pr UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg); @@ -2519,7 +2521,7 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2553,7 +2555,7 @@ UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_Enum } UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg); @@ -2693,11 +2695,11 @@ UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(co UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.EnumValueDescriptorProto */ @@ -2787,15 +2789,15 @@ UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const googl UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg); @@ -2909,7 +2911,7 @@ UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2943,7 +2945,7 @@ UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_Service } UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg); @@ -3089,19 +3091,19 @@ UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 48), 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg); @@ -3113,11 +3115,11 @@ UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescripto } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 9), 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(17, 10), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FileOptions */ @@ -3511,83 +3513,83 @@ UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {8, 40, 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) { const upb_MiniTableField field = {9, 12, 66, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {10, 16, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 56), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {16, 17, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {17, 18, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {18, 19, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {20, 20, 72, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {23, 21, 73, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {27, 22, 74, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {31, 23, 75, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {36, UPB_SIZE(56, 72), 76, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {37, UPB_SIZE(64, 88), 77, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {39, UPB_SIZE(72, 104), 78, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {40, UPB_SIZE(80, 120), 79, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {41, UPB_SIZE(88, 136), 80, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {44, UPB_SIZE(96, 152), 81, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {45, UPB_SIZE(104, 168), 82, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {50, UPB_SIZE(24, 184), 83, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg); @@ -3795,27 +3797,27 @@ UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {2, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {3, 11, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {7, 12, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {11, 13, 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {12, 16, 69, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg); @@ -3893,19 +3895,19 @@ UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf return ptr; } UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) { @@ -3957,19 +3959,19 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_Fiel return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) { @@ -4021,27 +4023,27 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_proto return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4052,7 +4054,7 @@ UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_prot } } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4060,7 +4062,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(cons return arr; } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4116,12 +4118,28 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_ const upb_MiniTableField field = {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_protobuf_FieldOptions_clear_feature_support(google_protobuf_FieldOptions* msg) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_feature_support(const google_protobuf_FieldOptions* msg) { + const google_protobuf_FieldOptions_FeatureSupport* default_val = NULL; + const google_protobuf_FieldOptions_FeatureSupport* ret; + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_has_feature_support(const google_protobuf_FieldOptions* msg) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4132,7 +4150,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fie } } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4140,7 +4158,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_u return arr; } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4150,43 +4168,43 @@ UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable } UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {3, 17, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {5, 18, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {10, 24, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {15, 25, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {16, 26, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4197,12 +4215,12 @@ UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf } } UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4245,7 +4263,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_F } UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg); @@ -4255,8 +4273,20 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } return sub; } +UPB_INLINE void google_protobuf_FieldOptions_set_feature_support(google_protobuf_FieldOptions *msg, google_protobuf_FieldOptions_FeatureSupport* value) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_mutable_feature_support(google_protobuf_FieldOptions* msg, upb_Arena* arena) { + struct google_protobuf_FieldOptions_FeatureSupport* sub = (struct google_protobuf_FieldOptions_FeatureSupport*)google_protobuf_FieldOptions_feature_support(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); + if (sub) google_protobuf_FieldOptions_set_feature_support(msg, sub); + } + return sub; +} UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4267,12 +4297,12 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mu } } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4357,11 +4387,129 @@ UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const go UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 65, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* google.protobuf.FieldOptions.FeatureSupport */ + +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_new(upb_Arena* arena) { + return (google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); +} +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_parse(const char* buf, size_t size, upb_Arena* arena) { + google_protobuf_FieldOptions_FeatureSupport* ret = google_protobuf_FieldOptions_FeatureSupport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__protobuf__FieldOptions__FeatureSupport_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + google_protobuf_FieldOptions_FeatureSupport* ret = google_protobuf_FieldOptions_FeatureSupport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__protobuf__FieldOptions__FeatureSupport_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* google_protobuf_FieldOptions_FeatureSupport_serialize(const google_protobuf_FieldOptions_FeatureSupport* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FieldOptions__FeatureSupport_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* google_protobuf_FieldOptions_FeatureSupport_serialize_ex(const google_protobuf_FieldOptions_FeatureSupport* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FieldOptions__FeatureSupport_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_introduced(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_introduced(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_introduced(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_deprecated(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_deprecated(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_deprecated(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_deprecation_warning(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView google_protobuf_FieldOptions_FeatureSupport_deprecation_warning(const google_protobuf_FieldOptions_FeatureSupport* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_deprecation_warning(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_removed(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_removed(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_removed(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_introduced(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_deprecated(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_deprecation_warning(google_protobuf_FieldOptions_FeatureSupport *msg, upb_StringView value) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_removed(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofOptions */ @@ -4451,7 +4599,7 @@ UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg); @@ -4627,19 +4775,19 @@ UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {3, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {6, 11, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg); @@ -4764,12 +4912,28 @@ UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_p const upb_MiniTableField field = {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_protobuf_EnumValueOptions_clear_feature_support(google_protobuf_EnumValueOptions* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_EnumValueOptions_feature_support(const google_protobuf_EnumValueOptions* msg) { + const google_protobuf_FieldOptions_FeatureSupport* default_val = NULL; + const google_protobuf_FieldOptions_FeatureSupport* ret; + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_EnumValueOptions_has_feature_support(const google_protobuf_EnumValueOptions* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4780,7 +4944,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } } UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4788,7 +4952,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_opti return arr; } UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4799,11 +4963,11 @@ UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mut UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg); @@ -4815,10 +4979,22 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_m } UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_EnumValueOptions_set_feature_support(google_protobuf_EnumValueOptions *msg, google_protobuf_FieldOptions_FeatureSupport* value) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_EnumValueOptions_mutable_feature_support(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { + struct google_protobuf_FieldOptions_FeatureSupport* sub = (struct google_protobuf_FieldOptions_FeatureSupport*)google_protobuf_EnumValueOptions_feature_support(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); + if (sub) google_protobuf_EnumValueOptions_set_feature_support(msg, sub); + } + return sub; } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4829,12 +5005,12 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4951,11 +5127,11 @@ UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) { const upb_MiniTableField field = {33, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {34, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg); @@ -5115,15 +5291,15 @@ UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutabl UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) { const upb_MiniTableField field = {33, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) { const upb_MiniTableField field = {34, 12, 65, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {35, 16, 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg); @@ -5361,27 +5537,27 @@ UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_ } UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 66, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 56), 67, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 64), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(56, 80), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UninterpretedOption.NamePart */ @@ -5455,11 +5631,11 @@ UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(co UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) { const upb_MiniTableField field = {2, 9, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSet */ @@ -5597,27 +5773,27 @@ UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {6, 32, 69, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults */ @@ -5753,11 +5929,11 @@ UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* g } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 12), 64, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 65, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */ @@ -5796,54 +5972,82 @@ UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_ser (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, options, arena, &ptr, len); return ptr; } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { +UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_overridable_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } -UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_overridable_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - int32_t default_val = 0; - int32_t ret; - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_fixed_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const google_protobuf_FeatureSet* default_val = NULL; + const google_protobuf_FeatureSet* ret; + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } -UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_fixed_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } -UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { - struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg); +UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { + struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_overridable_features(msg); if (sub == NULL) { sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena); - if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(msg, sub); + if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_overridable_features(msg, sub); } return sub; } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { + struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_fixed_features(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena); + if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_fixed_features(msg, sub); + } + return sub; } /* google.protobuf.SourceCodeInfo */ @@ -6169,11 +6373,11 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 48), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6467,19 +6671,19 @@ UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_pro } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 16), 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 20), 67, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* Max size 32 is google.protobuf.FileOptions */ diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c index 3625687c80..9bd32e1087 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { &google_protobuf_FileDescriptorSet_submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileDescriptorSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max192b}, @@ -60,6 +63,9 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { &google_protobuf_FileDescriptorProto_submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -108,6 +114,9 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { &google_protobuf_DescriptorProto_submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -142,6 +151,9 @@ const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto.ExtensionRange", +#endif }; static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = { @@ -153,6 +165,9 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = NULL, &google_protobuf_DescriptorProto_ReservedRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto.ReservedRange", +#endif }; static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = { @@ -173,6 +188,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { &google_protobuf_ExtensionRangeOptions_submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ExtensionRangeOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -221,6 +239,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini NULL, &google_protobuf_ExtensionRangeOptions_Declaration__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ExtensionRangeOptions.Declaration", +#endif }; static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = { @@ -247,6 +268,9 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { &google_protobuf_FieldDescriptorProto_submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = { @@ -262,6 +286,9 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { &google_protobuf_OneofDescriptorProto_submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.OneofDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = { @@ -282,6 +309,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { &google_protobuf_EnumDescriptorProto_submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -303,6 +333,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg NULL, &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumDescriptorProto.EnumReservedRange", +#endif }; static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { @@ -319,6 +352,9 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { &google_protobuf_EnumValueDescriptorProto_submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumValueDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = { @@ -336,6 +372,9 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { &google_protobuf_ServiceDescriptorProto_submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ServiceDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -361,6 +400,9 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { &google_protobuf_MethodDescriptorProto_submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MethodDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = { @@ -397,6 +439,9 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { &google_protobuf_FileOptions_submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -452,6 +497,9 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { &google_protobuf_MessageOptions_submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MessageOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -488,9 +536,10 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = { +static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, @@ -498,26 +547,30 @@ static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = { {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, }; -static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = { - {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { + {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {3, 17, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {5, 18, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {10, 24, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {15, 25, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {16, 26, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { &google_protobuf_FieldOptions_submsgs[0], &google_protobuf_FieldOptions__fields[0], - UPB_SIZE(48, 64), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -542,7 +595,7 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { {0x002800003f0001a2, &upb_prm_2bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x003800003f023eba, &upb_prm_2bt_max128b}, + {0x004000003f033eba, &upb_prm_2bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -567,6 +620,31 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { &google_protobuf_FieldOptions_EditionDefault_submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions.EditionDefault", +#endif +}; + +static const upb_MiniTableSub google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +}; + +static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { + {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { + &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__fields[0], + UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions.FeatureSupport", +#endif }; static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = { @@ -583,6 +661,9 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { &google_protobuf_OneofOptions_submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.OneofOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -636,6 +717,9 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { &google_protobuf_EnumOptions_submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -672,22 +756,27 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = { +static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, }; -static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = { +static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { &google_protobuf_EnumValueOptions_submsgs[0], &google_protobuf_EnumValueOptions__fields[0], - UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumValueOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -712,7 +801,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x001800003f013eba, &upb_prm_2bt_max128b}, + {0x002000003f023eba, &upb_prm_2bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -739,6 +828,9 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { &google_protobuf_ServiceOptions_submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ServiceOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -792,6 +884,9 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { &google_protobuf_MethodOptions_submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MethodOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -846,6 +941,9 @@ const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { &google_protobuf_UninterpretedOption_submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UninterpretedOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -863,6 +961,9 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { NULL, &google_protobuf_UninterpretedOption_NamePart__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 2, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UninterpretedOption.NamePart", +#endif }; static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = { @@ -887,6 +988,9 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { &google_protobuf_FeatureSet_submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSet", +#endif }; static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = { @@ -905,26 +1009,34 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { &google_protobuf_FeatureSetDefaults_submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSetDefaults", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_prm_1bt_max64b}, }) }; -static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[2] = { +static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; -static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[2] = { - {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { + {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault", +#endif }; static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = { @@ -939,6 +1051,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { &google_protobuf_SourceCodeInfo_submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.SourceCodeInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -957,6 +1072,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { NULL, &google_protobuf_SourceCodeInfo_Location__fields[0], UPB_SIZE(40, 72), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.SourceCodeInfo.Location", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -981,6 +1099,9 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { &google_protobuf_GeneratedCodeInfo_submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.GeneratedCodeInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -1003,13 +1124,16 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.GeneratedCodeInfo.Annotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_ppv4_1bt}, }) }; -static const upb_MiniTable *messages_layout[32] = { +static const upb_MiniTable *messages_layout[33] = { &google__protobuf__FileDescriptorSet_msg_init, &google__protobuf__FileDescriptorProto_msg_init, &google__protobuf__DescriptorProto_msg_init, @@ -1028,6 +1152,7 @@ static const upb_MiniTable *messages_layout[32] = { &google__protobuf__MessageOptions_msg_init, &google__protobuf__FieldOptions_msg_init, &google__protobuf__FieldOptions__EditionDefault_msg_init, + &google__protobuf__FieldOptions__FeatureSupport_msg_init, &google__protobuf__OneofOptions_msg_init, &google__protobuf__EnumOptions_msg_init, &google__protobuf__EnumValueOptions_msg_init, @@ -1046,10 +1171,11 @@ static const upb_MiniTable *messages_layout[32] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8, @@ -1229,7 +1355,7 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { messages_layout, enums_layout, NULL, - 32, + 33, 17, 0, }; diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h index 8416e9a4f5..f48a64df65 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h @@ -35,6 +35,7 @@ extern const upb_MiniTable google__protobuf__FileOptions_msg_init; extern const upb_MiniTable google__protobuf__MessageOptions_msg_init; extern const upb_MiniTable google__protobuf__FieldOptions_msg_init; extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init; +extern const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init; extern const upb_MiniTable google__protobuf__OneofOptions_msg_init; extern const upb_MiniTable google__protobuf__EnumOptions_msg_init; extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init; diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb.h index 7046399e75..87c825cccf 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb.h @@ -86,11 +86,11 @@ UPB_INLINE int32_t google_protobuf_Duration_nanos(const google_protobuf_Duration UPB_INLINE void google_protobuf_Duration_set_seconds(google_protobuf_Duration *msg, int64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Duration_set_nanos(google_protobuf_Duration *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c index 97952deede..75ac19d03a 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Duration_msg_init = { NULL, &google_protobuf_Duration__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Duration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c index aa6071564e..89c53e4fd8 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c @@ -16,6 +16,9 @@ const upb_MiniTable google__protobuf__Empty_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Empty", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb.h index f629f7e268..19b51848dd 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb.h @@ -292,23 +292,23 @@ UPB_INLINE bool google_protobuf_Value_has_list_value(const google_protobuf_Value UPB_INLINE void google_protobuf_Value_set_null_value(google_protobuf_Value *msg, int32_t value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_number_value(google_protobuf_Value *msg, double value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_string_value(google_protobuf_Value *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_bool_value(google_protobuf_Value *msg, bool value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_struct_value(google_protobuf_Value *msg, google_protobuf_Struct* value) { const upb_MiniTableField field = {5, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_value(google_protobuf_Value* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)google_protobuf_Value_struct_value(msg); @@ -320,7 +320,7 @@ UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_v } UPB_INLINE void google_protobuf_Value_set_list_value(google_protobuf_Value *msg, google_protobuf_ListValue* value) { const upb_MiniTableField field = {6, 16, -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ListValue* google_protobuf_Value_mutable_list_value(google_protobuf_Value* msg, upb_Arena* arena) { struct google_protobuf_ListValue* sub = (struct google_protobuf_ListValue*)google_protobuf_Value_list_value(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c index 078c291bab..514d9755bd 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable google__protobuf__Struct_msg_init = { &google_protobuf_Struct_submsgs[0], &google_protobuf_Struct__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Struct", +#endif }; static const upb_MiniTableSub google_protobuf_Struct_FieldsEntry_submsgs[1] = { @@ -39,6 +42,9 @@ const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = { &google_protobuf_Struct_FieldsEntry_submsgs[0], &google_protobuf_Struct_FieldsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Struct.FieldsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -63,6 +69,9 @@ const upb_MiniTable google__protobuf__Value_msg_init = { &google_protobuf_Value_submsgs[0], &google_protobuf_Value__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -87,6 +96,9 @@ const upb_MiniTable google__protobuf__ListValue_msg_init = { &google_protobuf_ListValue_submsgs[0], &google_protobuf_ListValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ListValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h index d4963be729..9ac16177dc 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h @@ -86,11 +86,11 @@ UPB_INLINE int32_t google_protobuf_Timestamp_nanos(const google_protobuf_Timesta UPB_INLINE void google_protobuf_Timestamp_set_seconds(google_protobuf_Timestamp *msg, int64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Timestamp_set_nanos(google_protobuf_Timestamp *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c index 76fd9c1e48..c18cf11f95 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Timestamp_msg_init = { NULL, &google_protobuf_Timestamp__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Timestamp", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h b/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h index 2b1e7dc48a..d31a8e4d4c 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h @@ -82,7 +82,7 @@ UPB_INLINE double google_protobuf_DoubleValue_value(const google_protobuf_Double UPB_INLINE void google_protobuf_DoubleValue_set_value(google_protobuf_DoubleValue *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FloatValue */ @@ -136,7 +136,7 @@ UPB_INLINE float google_protobuf_FloatValue_value(const google_protobuf_FloatVal UPB_INLINE void google_protobuf_FloatValue_set_value(google_protobuf_FloatValue *msg, float value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.Int64Value */ @@ -190,7 +190,7 @@ UPB_INLINE int64_t google_protobuf_Int64Value_value(const google_protobuf_Int64V UPB_INLINE void google_protobuf_Int64Value_set_value(google_protobuf_Int64Value *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UInt64Value */ @@ -244,7 +244,7 @@ UPB_INLINE uint64_t google_protobuf_UInt64Value_value(const google_protobuf_UInt UPB_INLINE void google_protobuf_UInt64Value_set_value(google_protobuf_UInt64Value *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.Int32Value */ @@ -298,7 +298,7 @@ UPB_INLINE int32_t google_protobuf_Int32Value_value(const google_protobuf_Int32V UPB_INLINE void google_protobuf_Int32Value_set_value(google_protobuf_Int32Value *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UInt32Value */ @@ -352,7 +352,7 @@ UPB_INLINE uint32_t google_protobuf_UInt32Value_value(const google_protobuf_UInt UPB_INLINE void google_protobuf_UInt32Value_set_value(google_protobuf_UInt32Value *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.BoolValue */ @@ -406,7 +406,7 @@ UPB_INLINE bool google_protobuf_BoolValue_value(const google_protobuf_BoolValue* UPB_INLINE void google_protobuf_BoolValue_set_value(google_protobuf_BoolValue *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.StringValue */ @@ -460,7 +460,7 @@ UPB_INLINE upb_StringView google_protobuf_StringValue_value(const google_protobu UPB_INLINE void google_protobuf_StringValue_set_value(google_protobuf_StringValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.BytesValue */ @@ -514,7 +514,7 @@ UPB_INLINE upb_StringView google_protobuf_BytesValue_value(const google_protobuf UPB_INLINE void google_protobuf_BytesValue_set_value(google_protobuf_BytesValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c index a2757bc23f..57a4aa7504 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c @@ -20,6 +20,9 @@ const upb_MiniTable google__protobuf__DoubleValue_msg_init = { NULL, &google_protobuf_DoubleValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DoubleValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -34,6 +37,9 @@ const upb_MiniTable google__protobuf__FloatValue_msg_init = { NULL, &google_protobuf_FloatValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FloatValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000d, &upb_psf4_1bt}, @@ -48,6 +54,9 @@ const upb_MiniTable google__protobuf__Int64Value_msg_init = { NULL, &google_protobuf_Int64Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Int64Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -62,6 +71,9 @@ const upb_MiniTable google__protobuf__UInt64Value_msg_init = { NULL, &google_protobuf_UInt64Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UInt64Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -76,6 +88,9 @@ const upb_MiniTable google__protobuf__Int32Value_msg_init = { NULL, &google_protobuf_Int32Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Int32Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -90,6 +105,9 @@ const upb_MiniTable google__protobuf__UInt32Value_msg_init = { NULL, &google_protobuf_UInt32Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UInt32Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -104,6 +122,9 @@ const upb_MiniTable google__protobuf__BoolValue_msg_init = { NULL, &google_protobuf_BoolValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.BoolValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -118,6 +139,9 @@ const upb_MiniTable google__protobuf__StringValue_msg_init = { NULL, &google_protobuf_StringValue__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.StringValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -132,6 +156,9 @@ const upb_MiniTable google__protobuf__BytesValue_msg_init = { NULL, &google_protobuf_BytesValue__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.BytesValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_psb_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb.h b/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb.h index ba5f9d4a26..6c435f4f68 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb.h @@ -121,11 +121,11 @@ UPB_INLINE upb_Array* _google_rpc_Status_details_mutable_upb_array(google_rpc_St UPB_INLINE void google_rpc_Status_set_code(google_rpc_Status *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_rpc_Status_set_message(google_rpc_Status *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** google_rpc_Status_mutable_details(google_rpc_Status* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c index 2eae96c681..9db3b29015 100644 --- a/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable google__rpc__Status_msg_init = { &google_rpc_Status_submsgs[0], &google_rpc_Status__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.rpc.Status", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h b/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h index 66c95198e5..ab7f12d207 100644 --- a/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h @@ -178,7 +178,7 @@ UPB_INLINE int64_t opencensus_proto_trace_v1_TraceConfig_max_number_of_links(con UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_probability_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_ProbabilitySampler* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 48), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_v1_TraceConfig_mutable_probability_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_ProbabilitySampler* sub = (struct opencensus_proto_trace_v1_ProbabilitySampler*)opencensus_proto_trace_v1_TraceConfig_probability_sampler(msg); @@ -190,7 +190,7 @@ UPB_INLINE struct opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_constant_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_ConstantSampler* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_TraceConfig_mutable_constant_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_ConstantSampler* sub = (struct opencensus_proto_trace_v1_ConstantSampler*)opencensus_proto_trace_v1_TraceConfig_constant_sampler(msg); @@ -202,7 +202,7 @@ UPB_INLINE struct opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_tr } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_rate_limiting_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_RateLimitingSampler* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace_v1_TraceConfig_mutable_rate_limiting_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_RateLimitingSampler* sub = (struct opencensus_proto_trace_v1_RateLimitingSampler*)opencensus_proto_trace_v1_TraceConfig_rate_limiting_sampler(msg); @@ -214,19 +214,19 @@ UPB_INLINE struct opencensus_proto_trace_v1_RateLimitingSampler* opencensus_prot } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_attributes(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_annotations(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {5, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_message_events(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {6, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_links(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {7, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.ProbabilitySampler */ @@ -280,7 +280,7 @@ UPB_INLINE double opencensus_proto_trace_v1_ProbabilitySampler_samplingProbabili UPB_INLINE void opencensus_proto_trace_v1_ProbabilitySampler_set_samplingProbability(opencensus_proto_trace_v1_ProbabilitySampler *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.ConstantSampler */ @@ -334,7 +334,7 @@ UPB_INLINE int32_t opencensus_proto_trace_v1_ConstantSampler_decision(const open UPB_INLINE void opencensus_proto_trace_v1_ConstantSampler_set_decision(opencensus_proto_trace_v1_ConstantSampler *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.RateLimitingSampler */ @@ -388,7 +388,7 @@ UPB_INLINE int64_t opencensus_proto_trace_v1_RateLimitingSampler_qps(const openc UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_set_qps(opencensus_proto_trace_v1_RateLimitingSampler *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c index cc1720d44d..7b7e5abba3 100644 --- a/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = { &opencensus_proto_trace_v1_TraceConfig_submsgs[0], &opencensus_proto_trace_v1_TraceConfig__fields[0], UPB_SIZE(48, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.TraceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003000080100000a, &upb_pom_1bt_max64b}, @@ -52,6 +55,9 @@ const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init = NULL, &opencensus_proto_trace_v1_ProbabilitySampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.ProbabilitySampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -66,6 +72,9 @@ const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init = { NULL, &opencensus_proto_trace_v1_ConstantSampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.ConstantSampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -80,6 +89,9 @@ const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init = NULL, &opencensus_proto_trace_v1_RateLimitingSampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.RateLimitingSampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h index b6e7b7208e..8f872c430c 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h @@ -171,27 +171,27 @@ UPB_INLINE upb_Map* _grpc_gcp_AltsContext_peer_attributes_mutable_upb_map(grpc_g UPB_INLINE void grpc_gcp_AltsContext_set_application_protocol(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_record_protocol(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_security_level(grpc_gcp_AltsContext *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_peer_service_account(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_local_service_account(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_peer_rpc_versions(grpc_gcp_AltsContext *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {6, UPB_SIZE(16, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_AltsContext_mutable_peer_rpc_versions(grpc_gcp_AltsContext* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_AltsContext_peer_rpc_versions(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c index 6691198110..ebc0fdc746 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable grpc__gcp__AltsContext_msg_init = { &grpc_gcp_AltsContext_submsgs[0], &grpc_gcp_AltsContext__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.AltsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -53,6 +56,9 @@ const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init = { NULL, &grpc_gcp_AltsContext_PeerAttributesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.AltsContext.PeerAttributesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h index e88e4b3617..cdfb19f47f 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h @@ -124,15 +124,15 @@ UPB_INLINE int32_t grpc_gcp_Endpoint_protocol(const grpc_gcp_Endpoint* msg) { UPB_INLINE void grpc_gcp_Endpoint_set_ip_address(grpc_gcp_Endpoint *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Endpoint_set_port(grpc_gcp_Endpoint *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Endpoint_set_protocol(grpc_gcp_Endpoint *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.Identity */ @@ -245,11 +245,11 @@ UPB_INLINE upb_Map* _grpc_gcp_Identity_attributes_mutable_upb_map(grpc_gcp_Ident UPB_INLINE void grpc_gcp_Identity_set_service_account(grpc_gcp_Identity *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Identity_set_hostname(grpc_gcp_Identity *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Identity_attributes_clear(grpc_gcp_Identity* msg) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -529,7 +529,7 @@ UPB_INLINE uint32_t grpc_gcp_StartClientHandshakeReq_max_frame_size(const grpc_g UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_handshake_security_protocol(grpc_gcp_StartClientHandshakeReq *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_gcp_StartClientHandshakeReq_mutable_application_protocols(grpc_gcp_StartClientHandshakeReq* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -619,7 +619,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_add_target } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_identity(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_mutable_local_identity(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_StartClientHandshakeReq_local_identity(msg); @@ -631,7 +631,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_endpoint(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_local_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_local_endpoint(msg); @@ -643,7 +643,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_remote_endpoint(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_remote_endpoint(msg); @@ -655,11 +655,11 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_re } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_target_name(grpc_gcp_StartClientHandshakeReq *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_rpc_versions(grpc_gcp_StartClientHandshakeReq *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandshakeReq_mutable_rpc_versions(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartClientHandshakeReq_rpc_versions(msg); @@ -671,7 +671,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandshakeReq } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_max_frame_size(grpc_gcp_StartClientHandshakeReq *msg, uint32_t value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.ServerHandshakeParameters */ @@ -1059,11 +1059,11 @@ UPB_INLINE grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry* grpc_gcp_S } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_in_bytes(grpc_gcp_StartServerHandshakeReq *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_local_endpoint(grpc_gcp_StartServerHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_local_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_local_endpoint(msg); @@ -1075,7 +1075,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_remote_endpoint(grpc_gcp_StartServerHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_remote_endpoint(msg); @@ -1087,7 +1087,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_re } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_rpc_versions(grpc_gcp_StartServerHandshakeReq *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandshakeReq_mutable_rpc_versions(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartServerHandshakeReq_rpc_versions(msg); @@ -1099,7 +1099,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandshakeReq } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_max_frame_size(grpc_gcp_StartServerHandshakeReq *msg, uint32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.StartServerHandshakeReq.HandshakeParametersEntry */ @@ -1174,7 +1174,7 @@ UPB_INLINE upb_StringView grpc_gcp_NextHandshakeMessageReq_in_bytes(const grpc_g UPB_INLINE void grpc_gcp_NextHandshakeMessageReq_set_in_bytes(grpc_gcp_NextHandshakeMessageReq *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerReq */ @@ -1275,7 +1275,7 @@ UPB_INLINE bool grpc_gcp_HandshakerReq_has_next(const grpc_gcp_HandshakerReq* ms UPB_INLINE void grpc_gcp_HandshakerReq_set_client_start(grpc_gcp_HandshakerReq *msg, grpc_gcp_StartClientHandshakeReq* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_mutable_client_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_StartClientHandshakeReq* sub = (struct grpc_gcp_StartClientHandshakeReq*)grpc_gcp_HandshakerReq_client_start(msg); @@ -1287,7 +1287,7 @@ UPB_INLINE struct grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_mutab } UPB_INLINE void grpc_gcp_HandshakerReq_set_server_start(grpc_gcp_HandshakerReq *msg, grpc_gcp_StartServerHandshakeReq* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_mutable_server_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_StartServerHandshakeReq* sub = (struct grpc_gcp_StartServerHandshakeReq*)grpc_gcp_HandshakerReq_server_start(msg); @@ -1299,7 +1299,7 @@ UPB_INLINE struct grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_mutab } UPB_INLINE void grpc_gcp_HandshakerReq_set_next(grpc_gcp_HandshakerReq *msg, grpc_gcp_NextHandshakeMessageReq* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_NextHandshakeMessageReq* grpc_gcp_HandshakerReq_mutable_next(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_NextHandshakeMessageReq* sub = (struct grpc_gcp_NextHandshakeMessageReq*)grpc_gcp_HandshakerReq_next(msg); @@ -1457,19 +1457,19 @@ UPB_INLINE uint32_t grpc_gcp_HandshakerResult_max_frame_size(const grpc_gcp_Hand UPB_INLINE void grpc_gcp_HandshakerResult_set_application_protocol(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_record_protocol(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(40, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_key_data(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {3, 48, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_identity(grpc_gcp_HandshakerResult *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_peer_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_peer_identity(msg); @@ -1481,7 +1481,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_peer_iden } UPB_INLINE void grpc_gcp_HandshakerResult_set_local_identity(grpc_gcp_HandshakerResult *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 72), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_local_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_local_identity(msg); @@ -1493,11 +1493,11 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_local_ide } UPB_INLINE void grpc_gcp_HandshakerResult_set_keep_channel_open(grpc_gcp_HandshakerResult *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_rpc_versions(grpc_gcp_HandshakerResult *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 80), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_mutable_peer_rpc_versions(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_HandshakerResult_peer_rpc_versions(msg); @@ -1509,7 +1509,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_mutabl } UPB_INLINE void grpc_gcp_HandshakerResult_set_max_frame_size(grpc_gcp_HandshakerResult *msg, uint32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerStatus */ @@ -1575,11 +1575,11 @@ UPB_INLINE upb_StringView grpc_gcp_HandshakerStatus_details(const grpc_gcp_Hands UPB_INLINE void grpc_gcp_HandshakerStatus_set_code(grpc_gcp_HandshakerStatus *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerStatus_set_details(grpc_gcp_HandshakerStatus *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerResp */ @@ -1677,15 +1677,15 @@ UPB_INLINE bool grpc_gcp_HandshakerResp_has_status(const grpc_gcp_HandshakerResp UPB_INLINE void grpc_gcp_HandshakerResp_set_out_frames(grpc_gcp_HandshakerResp *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResp_set_bytes_consumed(grpc_gcp_HandshakerResp *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResp_set_result(grpc_gcp_HandshakerResp *msg, grpc_gcp_HandshakerResult* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_mutable_result(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) { struct grpc_gcp_HandshakerResult* sub = (struct grpc_gcp_HandshakerResult*)grpc_gcp_HandshakerResp_result(msg); @@ -1697,7 +1697,7 @@ UPB_INLINE struct grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_mutable_res } UPB_INLINE void grpc_gcp_HandshakerResp_set_status(grpc_gcp_HandshakerResp *msg, grpc_gcp_HandshakerStatus* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_mutable_status(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) { struct grpc_gcp_HandshakerStatus* sub = (struct grpc_gcp_HandshakerStatus*)grpc_gcp_HandshakerResp_status(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c index 11373e1ed4..fc1ebd9f43 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable grpc__gcp__Endpoint_msg_init = { NULL, &grpc_gcp_Endpoint__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Endpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -45,6 +48,9 @@ const upb_MiniTable grpc__gcp__Identity_msg_init = { &grpc_gcp_Identity_submsgs[0], &grpc_gcp_Identity__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Identity", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -62,6 +68,9 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = { NULL, &grpc_gcp_Identity_AttributesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Identity.AttributesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -95,6 +104,9 @@ const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = { &grpc_gcp_StartClientHandshakeReq_submsgs[0], &grpc_gcp_StartClientHandshakeReq__fields[0], UPB_SIZE(56, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartClientHandshakeReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -128,6 +140,9 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = { &grpc_gcp_ServerHandshakeParameters_submsgs[0], &grpc_gcp_ServerHandshakeParameters__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.ServerHandshakeParameters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -157,6 +172,9 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = { &grpc_gcp_StartServerHandshakeReq_submsgs[0], &grpc_gcp_StartServerHandshakeReq__fields[0], UPB_SIZE(48, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartServerHandshakeReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, @@ -182,6 +200,9 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0], &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartServerHandshakeReq.HandshakeParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv4_1bt}, @@ -196,6 +217,9 @@ const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = { NULL, &grpc_gcp_NextHandshakeMessageReq__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.NextHandshakeMessageReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_psb_1bt}, @@ -218,6 +242,9 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = { &grpc_gcp_HandshakerReq_submsgs[0], &grpc_gcp_HandshakerReq__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, @@ -247,6 +274,9 @@ const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = { &grpc_gcp_HandshakerResult_submsgs[0], &grpc_gcp_HandshakerResult__fields[0], UPB_SIZE(56, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerResult", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -276,6 +306,9 @@ const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = { NULL, &grpc_gcp_HandshakerStatus__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -300,6 +333,9 @@ const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = { &grpc_gcp_HandshakerResp_submsgs[0], &grpc_gcp_HandshakerResp__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerResp", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_psb_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h index ce3dd227cf..69ad9dc44f 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h @@ -101,7 +101,7 @@ UPB_INLINE bool grpc_gcp_RpcProtocolVersions_has_min_rpc_version(const grpc_gcp_ UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_max_rpc_version(grpc_gcp_RpcProtocolVersions *msg, grpc_gcp_RpcProtocolVersions_Version* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_max_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_max_rpc_version(msg); @@ -113,7 +113,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVers } UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_min_rpc_version(grpc_gcp_RpcProtocolVersions *msg, grpc_gcp_RpcProtocolVersions_Version* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_min_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_min_rpc_version(msg); @@ -187,11 +187,11 @@ UPB_INLINE uint32_t grpc_gcp_RpcProtocolVersions_Version_minor(const grpc_gcp_Rp UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_major(grpc_gcp_RpcProtocolVersions_Version *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProtocolVersions_Version *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c index e263e6c6f4..53c3841040 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = { &grpc_gcp_RpcProtocolVersions_submsgs[0], &grpc_gcp_RpcProtocolVersions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.RpcProtocolVersions", +#endif }; static const upb_MiniTableField grpc_gcp_RpcProtocolVersions_Version__fields[2] = { @@ -37,6 +40,9 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init = { NULL, &grpc_gcp_RpcProtocolVersions_Version__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.RpcProtocolVersions.Version", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h index 504cd0c12b..30b433376f 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h @@ -82,7 +82,7 @@ UPB_INLINE upb_StringView grpc_health_v1_HealthCheckRequest_service(const grpc_h UPB_INLINE void grpc_health_v1_HealthCheckRequest_set_service(grpc_health_v1_HealthCheckRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.health.v1.HealthCheckResponse */ @@ -136,7 +136,7 @@ UPB_INLINE int32_t grpc_health_v1_HealthCheckResponse_status(const grpc_health_v UPB_INLINE void grpc_health_v1_HealthCheckResponse_set_status(grpc_health_v1_HealthCheckResponse *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c index 3524fd2910..e5d5760e4d 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c @@ -20,6 +20,9 @@ const upb_MiniTable grpc__health__v1__HealthCheckRequest_msg_init = { NULL, &grpc_health_v1_HealthCheckRequest__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.health.v1.HealthCheckRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -34,6 +37,9 @@ const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init = { NULL, &grpc_health_v1_HealthCheckResponse__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.health.v1.HealthCheckResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h index 0d311b82eb..2008fd7137 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h @@ -117,7 +117,7 @@ UPB_INLINE bool grpc_lb_v1_LoadBalanceRequest_has_client_stats(const grpc_lb_v1_ UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_initial_request(grpc_lb_v1_LoadBalanceRequest *msg, grpc_lb_v1_InitialLoadBalanceRequest* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_mutable_initial_request(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) { struct grpc_lb_v1_InitialLoadBalanceRequest* sub = (struct grpc_lb_v1_InitialLoadBalanceRequest*)grpc_lb_v1_LoadBalanceRequest_initial_request(msg); @@ -129,7 +129,7 @@ UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceRe } UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_client_stats(grpc_lb_v1_LoadBalanceRequest *msg, grpc_lb_v1_ClientStats* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_ClientStats* grpc_lb_v1_LoadBalanceRequest_mutable_client_stats(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) { struct grpc_lb_v1_ClientStats* sub = (struct grpc_lb_v1_ClientStats*)grpc_lb_v1_LoadBalanceRequest_client_stats(msg); @@ -191,7 +191,7 @@ UPB_INLINE upb_StringView grpc_lb_v1_InitialLoadBalanceRequest_name(const grpc_l UPB_INLINE void grpc_lb_v1_InitialLoadBalanceRequest_set_name(grpc_lb_v1_InitialLoadBalanceRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lb.v1.ClientStatsPerToken */ @@ -257,11 +257,11 @@ UPB_INLINE int64_t grpc_lb_v1_ClientStatsPerToken_num_calls(const grpc_lb_v1_Cli UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_set_load_balance_token(grpc_lb_v1_ClientStatsPerToken *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_set_num_calls(grpc_lb_v1_ClientStatsPerToken *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lb.v1.ClientStats */ @@ -399,7 +399,7 @@ UPB_INLINE upb_Array* _grpc_lb_v1_ClientStats_calls_finished_with_drop_mutable_u UPB_INLINE void grpc_lb_v1_ClientStats_set_timestamp(grpc_lb_v1_ClientStats *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_mutable_timestamp(grpc_lb_v1_ClientStats* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)grpc_lb_v1_ClientStats_timestamp(msg); @@ -411,19 +411,19 @@ UPB_INLINE struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_mutable_time } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_started(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished_with_client_failed_to_send(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {6, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished_known_received(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {7, 48, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE grpc_lb_v1_ClientStatsPerToken** grpc_lb_v1_ClientStats_mutable_calls_finished_with_drop(grpc_lb_v1_ClientStats* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -554,7 +554,7 @@ UPB_INLINE bool grpc_lb_v1_LoadBalanceResponse_has_fallback_response(const grpc_ UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_initial_response(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_InitialLoadBalanceResponse* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_mutable_initial_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_InitialLoadBalanceResponse* sub = (struct grpc_lb_v1_InitialLoadBalanceResponse*)grpc_lb_v1_LoadBalanceResponse_initial_response(msg); @@ -566,7 +566,7 @@ UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceR } UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_server_list(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_ServerList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_mutable_server_list(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_ServerList* sub = (struct grpc_lb_v1_ServerList*)grpc_lb_v1_LoadBalanceResponse_server_list(msg); @@ -578,7 +578,7 @@ UPB_INLINE struct grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_mutable_ } UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_fallback_response(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_FallbackResponse* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_FallbackResponse* grpc_lb_v1_LoadBalanceResponse_mutable_fallback_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_FallbackResponse* sub = (struct grpc_lb_v1_FallbackResponse*)grpc_lb_v1_LoadBalanceResponse_fallback_response(msg); @@ -682,7 +682,7 @@ UPB_INLINE bool grpc_lb_v1_InitialLoadBalanceResponse_has_client_stats_report_in UPB_INLINE void grpc_lb_v1_InitialLoadBalanceResponse_set_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lb_v1_InitialLoadBalanceResponse_mutable_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lb_v1_InitialLoadBalanceResponse_client_stats_report_interval(msg); @@ -880,19 +880,19 @@ UPB_INLINE bool grpc_lb_v1_Server_drop(const grpc_lb_v1_Server* msg) { UPB_INLINE void grpc_lb_v1_Server_set_ip_address(grpc_lb_v1_Server *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_port(grpc_lb_v1_Server *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_load_balance_token(grpc_lb_v1_Server *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_drop(grpc_lb_v1_Server *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c index 79baa883fc..58da640824 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = { &grpc_lb_v1_LoadBalanceRequest_submsgs[0], &grpc_lb_v1_LoadBalanceRequest__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.LoadBalanceRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -44,6 +47,9 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init = { NULL, &grpc_lb_v1_InitialLoadBalanceRequest__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.InitialLoadBalanceRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -59,6 +65,9 @@ const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = { NULL, &grpc_lb_v1_ClientStatsPerToken__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ClientStatsPerToken", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -85,6 +94,9 @@ const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = { &grpc_lb_v1_ClientStats_submsgs[0], &grpc_lb_v1_ClientStats__fields[0], UPB_SIZE(56, 64), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ClientStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -121,6 +133,9 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = { &grpc_lb_v1_LoadBalanceResponse_submsgs[0], &grpc_lb_v1_LoadBalanceResponse__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.LoadBalanceResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -133,6 +148,9 @@ const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.FallbackResponse", +#endif }; static const upb_MiniTableSub grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { @@ -147,6 +165,9 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = { &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0], &grpc_lb_v1_InitialLoadBalanceResponse__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.InitialLoadBalanceResponse", +#endif }; static const upb_MiniTableSub grpc_lb_v1_ServerList_submsgs[1] = { @@ -161,6 +182,9 @@ const upb_MiniTable grpc__lb__v1__ServerList_msg_init = { &grpc_lb_v1_ServerList_submsgs[0], &grpc_lb_v1_ServerList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ServerList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -178,6 +202,9 @@ const upb_MiniTable grpc__lb__v1__Server_msg_init = { NULL, &grpc_lb_v1_Server__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.Server", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_psb_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h index af2d5f48b7..d7ca062b2c 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h @@ -135,7 +135,7 @@ UPB_INLINE upb_StringView grpc_lookup_v1_RouteLookupRequest_stale_header_data(co UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_target_type(grpc_lookup_v1_RouteLookupRequest *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_key_map_clear(grpc_lookup_v1_RouteLookupRequest* msg) { const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -164,11 +164,11 @@ UPB_INLINE grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* grpc_lookup_v1_RouteLo } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_reason(grpc_lookup_v1_RouteLookupRequest *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_stale_header_data(grpc_lookup_v1_RouteLookupRequest *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.RouteLookupRequest.KeyMapEntry */ @@ -271,7 +271,7 @@ UPB_INLINE upb_Array* _grpc_lookup_v1_RouteLookupResponse_targets_mutable_upb_ar UPB_INLINE void grpc_lookup_v1_RouteLookupResponse_set_header_data(grpc_lookup_v1_RouteLookupResponse *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_RouteLookupResponse_mutable_targets(grpc_lookup_v1_RouteLookupResponse* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c index 08a38c9f53..098eefb87c 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = { &grpc_lookup_v1_RouteLookupRequest_submsgs[0], &grpc_lookup_v1_RouteLookupRequest__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -48,6 +51,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init = NULL, &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupRequest.KeyMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -65,6 +71,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init = { NULL, &grpc_lookup_v1_RouteLookupResponse__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h index 70d96fa930..41e7aa69f3 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h @@ -129,7 +129,7 @@ UPB_INLINE bool grpc_lookup_v1_NameMatcher_required_match(const grpc_lookup_v1_N UPB_INLINE void grpc_lookup_v1_NameMatcher_set_key(grpc_lookup_v1_NameMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_NameMatcher_mutable_names(grpc_lookup_v1_NameMatcher* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -161,7 +161,7 @@ UPB_INLINE bool grpc_lookup_v1_NameMatcher_add_names(grpc_lookup_v1_NameMatcher* } UPB_INLINE void grpc_lookup_v1_NameMatcher_set_required_match(grpc_lookup_v1_NameMatcher *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder */ @@ -372,7 +372,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_GrpcKeyBuilder_add_ } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_set_extra_keys(grpc_lookup_v1_GrpcKeyBuilder *msg, grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilder_mutable_extra_keys(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena) { struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* sub = (struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)grpc_lookup_v1_GrpcKeyBuilder_extra_keys(msg); @@ -471,11 +471,11 @@ UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_Name_method(const grpc_l UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_set_service(grpc_lookup_v1_GrpcKeyBuilder_Name *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_set_method(grpc_lookup_v1_GrpcKeyBuilder_Name *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys */ @@ -553,15 +553,15 @@ UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_method(const g UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_host(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_service(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_method(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry */ @@ -1213,11 +1213,11 @@ UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_RouteLookupConfi } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service(grpc_lookup_v1_RouteLookupConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service_timeout(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_lookup_service_timeout(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_lookup_service_timeout(msg); @@ -1229,7 +1229,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_max_age(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_max_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_max_age(msg); @@ -1241,7 +1241,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_stale_age(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_stale_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_stale_age(msg); @@ -1253,7 +1253,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_cache_size_bytes(grpc_lookup_v1_RouteLookupConfig *msg, int64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 72), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_RouteLookupConfig_mutable_valid_targets(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(32, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1285,7 +1285,7 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupConfig_add_valid_targets(grpc_lookup_v } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_default_target(grpc_lookup_v1_RouteLookupConfig *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(56, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.RouteLookupClusterSpecifier */ @@ -1343,7 +1343,7 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupClusterSpecifier_has_route_lookup_conf UPB_INLINE void grpc_lookup_v1_RouteLookupClusterSpecifier_set_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier *msg, grpc_lookup_v1_RouteLookupConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupClusterSpecifier_mutable_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier* msg, upb_Arena* arena) { struct grpc_lookup_v1_RouteLookupConfig* sub = (struct grpc_lookup_v1_RouteLookupConfig*)grpc_lookup_v1_RouteLookupClusterSpecifier_route_lookup_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c index 04accdff52..b9d68def84 100644 --- a/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = { NULL, &grpc_lookup_v1_NameMatcher__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.NameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -49,6 +52,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = { &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0], &grpc_lookup_v1_GrpcKeyBuilder__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -66,6 +72,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init = { NULL, &grpc_lookup_v1_GrpcKeyBuilder_Name__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.Name", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -84,6 +93,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init = { NULL, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -101,6 +113,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init NULL, &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -127,6 +142,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = { &grpc_lookup_v1_HttpKeyBuilder_submsgs[0], &grpc_lookup_v1_HttpKeyBuilder__fields[0], UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.HttpKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -148,6 +166,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init NULL, &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.HttpKeyBuilder.ConstantKeysEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -180,6 +201,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = { &grpc_lookup_v1_RouteLookupConfig_submsgs[0], &grpc_lookup_v1_RouteLookupConfig__fields[0], UPB_SIZE(64, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -212,6 +236,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = { &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0], &grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupClusterSpecifier", +#endif }; static const upb_MiniTable *messages_layout[9] = { diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h index fb85a23e21..3af3b765d8 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h @@ -83,7 +83,7 @@ UPB_INLINE upb_StringView udpa_annotations_MigrateAnnotation_rename(const udpa_a UPB_INLINE void udpa_annotations_MigrateAnnotation_set_rename(udpa_annotations_MigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* udpa.annotations.FieldMigrateAnnotation */ @@ -149,11 +149,11 @@ UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_oneof_promotio UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_rename(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_oneof_promotion(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* udpa.annotations.FileMigrateAnnotation */ @@ -207,7 +207,7 @@ UPB_INLINE upb_StringView udpa_annotations_FileMigrateAnnotation_move_to_package UPB_INLINE void udpa_annotations_FileMigrateAnnotation_set_move_to_package(udpa_annotations_FileMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_message_migrate(const struct google_protobuf_MessageOptions* msg) { @@ -231,9 +231,18 @@ UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_Mess UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_message_migrate(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_message_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_message_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_field_migrate(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_field_migrate_ext); } @@ -255,9 +264,18 @@ UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FieldMigrateAnnotation* udpa_annotations_mutable_field_migrate(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FieldMigrateAnnotation* sub = (struct udpa_annotations_FieldMigrateAnnotation*)udpa_annotations_field_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FieldMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FieldMigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_field_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_migrate_ext); } @@ -279,9 +297,18 @@ UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_migrate(struct google_protobuf_EnumOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_enum_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_value_migrate_ext); } @@ -303,9 +330,18 @@ UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_E UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_value_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_enum_value_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_file_migrate(const struct google_protobuf_FileOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_file_migrate_ext); } @@ -327,9 +363,18 @@ UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FileMigrateAnnotation* udpa_annotations_mutable_file_migrate(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FileMigrateAnnotation* sub = (struct udpa_annotations_FileMigrateAnnotation*)udpa_annotations_file_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FileMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FileMigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_file_migrate(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c index 6858d72249..3b63134fa1 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init = { NULL, &udpa_annotations_MigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.MigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init = { NULL, &udpa_annotations_FieldMigrateAnnotation__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FieldMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -52,6 +58,9 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = { NULL, &udpa_annotations_FileMigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FileMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb.h b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb.h index 3d23f5944f..3b00d090b7 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb.h @@ -90,11 +90,11 @@ UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_security(const struct google_protobuf_FieldOptions* msg) { @@ -118,9 +118,18 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mutable_security(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FieldSecurityAnnotation* sub = (struct udpa_annotations_FieldSecurityAnnotation*)udpa_annotations_security(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FieldSecurityAnnotation*)_upb_Message_New(&udpa__annotations__FieldSecurityAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_security(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c index ba9ef77a4a..af73bd4cac 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = { NULL, &udpa_annotations_FieldSecurityAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FieldSecurityAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h index f98ed2a6e8..3196d9cff3 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h @@ -45,7 +45,7 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb.h b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb.h index bb31624415..95f710a5a3 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb.h @@ -96,11 +96,11 @@ UPB_INLINE int32_t udpa_annotations_StatusAnnotation_package_version_status(cons UPB_INLINE void udpa_annotations_StatusAnnotation_set_work_in_progress(udpa_annotations_StatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_StatusAnnotation_set_package_version_status(udpa_annotations_StatusAnnotation *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_file_status(const struct google_protobuf_FileOptions* msg) { @@ -124,9 +124,18 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_file_status(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_StatusAnnotation* sub = (struct udpa_annotations_StatusAnnotation*)udpa_annotations_file_status(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_StatusAnnotation*)_upb_Message_New(&udpa__annotations__StatusAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_file_status(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c index a408659622..2eb07ceec1 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = { NULL, &udpa_annotations_StatusAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.StatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h index f16de22335..a9bfb48a4f 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView udpa_annotations_VersioningAnnotation_previous_message UPB_INLINE void udpa_annotations_VersioningAnnotation_set_previous_message_type(udpa_annotations_VersioningAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_versioning(const struct google_protobuf_MessageOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutable_versioning(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_VersioningAnnotation* sub = (struct udpa_annotations_VersioningAnnotation*)udpa_annotations_versioning(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_VersioningAnnotation*)_upb_Message_New(&udpa__annotations__VersioningAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_versioning(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c index e14a4e0573..fcb4fdea2a 100644 --- a/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = { NULL, &udpa_annotations_VersioningAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.VersioningAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/validate/validate.upb.h b/deps/grpc/src/core/ext/upb-gen/validate/validate.upb.h index 79ff48f5bc..ae9329d7ea 100644 --- a/deps/grpc/src/core/ext/upb-gen/validate/validate.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/validate/validate.upb.h @@ -480,7 +480,7 @@ UPB_INLINE bool validate_FieldRules_has_timestamp(const validate_FieldRules* msg UPB_INLINE void validate_FieldRules_set_float(validate_FieldRules *msg, validate_FloatRules* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validate_FieldRules* msg, upb_Arena* arena) { struct validate_FloatRules* sub = (struct validate_FloatRules*)validate_FieldRules_float(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validat } UPB_INLINE void validate_FieldRules_set_double(validate_FieldRules *msg, validate_DoubleRules* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(validate_FieldRules* msg, upb_Arena* arena) { struct validate_DoubleRules* sub = (struct validate_DoubleRules*)validate_FieldRules_double(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(valid } UPB_INLINE void validate_FieldRules_set_int32(validate_FieldRules *msg, validate_Int32Rules* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Int32Rules* sub = (struct validate_Int32Rules*)validate_FieldRules_int32(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validat } UPB_INLINE void validate_FieldRules_set_int64(validate_FieldRules *msg, validate_Int64Rules* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Int64Rules* sub = (struct validate_Int64Rules*)validate_FieldRules_int64(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validat } UPB_INLINE void validate_FieldRules_set_uint32(validate_FieldRules *msg, validate_UInt32Rules* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_UInt32Rules* sub = (struct validate_UInt32Rules*)validate_FieldRules_uint32(msg); @@ -540,7 +540,7 @@ UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(valid } UPB_INLINE void validate_FieldRules_set_uint64(validate_FieldRules *msg, validate_UInt64Rules* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_UInt64Rules* sub = (struct validate_UInt64Rules*)validate_FieldRules_uint64(msg); @@ -552,7 +552,7 @@ UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(valid } UPB_INLINE void validate_FieldRules_set_sint32(validate_FieldRules *msg, validate_SInt32Rules* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SInt32Rules* sub = (struct validate_SInt32Rules*)validate_FieldRules_sint32(msg); @@ -564,7 +564,7 @@ UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(valid } UPB_INLINE void validate_FieldRules_set_sint64(validate_FieldRules *msg, validate_SInt64Rules* value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SInt64Rules* sub = (struct validate_SInt64Rules*)validate_FieldRules_sint64(msg); @@ -576,7 +576,7 @@ UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(valid } UPB_INLINE void validate_FieldRules_set_fixed32(validate_FieldRules *msg, validate_Fixed32Rules* value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Fixed32Rules* sub = (struct validate_Fixed32Rules*)validate_FieldRules_fixed32(msg); @@ -588,7 +588,7 @@ UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(val } UPB_INLINE void validate_FieldRules_set_fixed64(validate_FieldRules *msg, validate_Fixed64Rules* value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Fixed64Rules* sub = (struct validate_Fixed64Rules*)validate_FieldRules_fixed64(msg); @@ -600,7 +600,7 @@ UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(val } UPB_INLINE void validate_FieldRules_set_sfixed32(validate_FieldRules *msg, validate_SFixed32Rules* value) { const upb_MiniTableField field = {11, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SFixed32Rules* sub = (struct validate_SFixed32Rules*)validate_FieldRules_sfixed32(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(v } UPB_INLINE void validate_FieldRules_set_sfixed64(validate_FieldRules *msg, validate_SFixed64Rules* value) { const upb_MiniTableField field = {12, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SFixed64Rules* sub = (struct validate_SFixed64Rules*)validate_FieldRules_sfixed64(msg); @@ -624,7 +624,7 @@ UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(v } UPB_INLINE void validate_FieldRules_set_bool(validate_FieldRules *msg, validate_BoolRules* value) { const upb_MiniTableField field = {13, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_FieldRules* msg, upb_Arena* arena) { struct validate_BoolRules* sub = (struct validate_BoolRules*)validate_FieldRules_bool(msg); @@ -636,7 +636,7 @@ UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_ } UPB_INLINE void validate_FieldRules_set_string(validate_FieldRules *msg, validate_StringRules* value) { const upb_MiniTableField field = {14, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(validate_FieldRules* msg, upb_Arena* arena) { struct validate_StringRules* sub = (struct validate_StringRules*)validate_FieldRules_string(msg); @@ -648,7 +648,7 @@ UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(valid } UPB_INLINE void validate_FieldRules_set_bytes(validate_FieldRules *msg, validate_BytesRules* value) { const upb_MiniTableField field = {15, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validate_FieldRules* msg, upb_Arena* arena) { struct validate_BytesRules* sub = (struct validate_BytesRules*)validate_FieldRules_bytes(msg); @@ -660,7 +660,7 @@ UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validat } UPB_INLINE void validate_FieldRules_set_enum(validate_FieldRules *msg, validate_EnumRules* value) { const upb_MiniTableField field = {16, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_FieldRules* msg, upb_Arena* arena) { struct validate_EnumRules* sub = (struct validate_EnumRules*)validate_FieldRules_enum(msg); @@ -672,7 +672,7 @@ UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_ } UPB_INLINE void validate_FieldRules_set_message(validate_FieldRules *msg, validate_MessageRules* value) { const upb_MiniTableField field = {17, UPB_SIZE(12, 16), 64, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(validate_FieldRules* msg, upb_Arena* arena) { struct validate_MessageRules* sub = (struct validate_MessageRules*)validate_FieldRules_message(msg); @@ -684,7 +684,7 @@ UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(val } UPB_INLINE void validate_FieldRules_set_repeated(validate_FieldRules *msg, validate_RepeatedRules* value) { const upb_MiniTableField field = {18, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(validate_FieldRules* msg, upb_Arena* arena) { struct validate_RepeatedRules* sub = (struct validate_RepeatedRules*)validate_FieldRules_repeated(msg); @@ -696,7 +696,7 @@ UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(v } UPB_INLINE void validate_FieldRules_set_map(validate_FieldRules *msg, validate_MapRules* value) { const upb_MiniTableField field = {19, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_FieldRules* msg, upb_Arena* arena) { struct validate_MapRules* sub = (struct validate_MapRules*)validate_FieldRules_map(msg); @@ -708,7 +708,7 @@ UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_Fi } UPB_INLINE void validate_FieldRules_set_any(validate_FieldRules *msg, validate_AnyRules* value) { const upb_MiniTableField field = {20, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_FieldRules* msg, upb_Arena* arena) { struct validate_AnyRules* sub = (struct validate_AnyRules*)validate_FieldRules_any(msg); @@ -720,7 +720,7 @@ UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_Fi } UPB_INLINE void validate_FieldRules_set_duration(validate_FieldRules *msg, validate_DurationRules* value) { const upb_MiniTableField field = {21, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(validate_FieldRules* msg, upb_Arena* arena) { struct validate_DurationRules* sub = (struct validate_DurationRules*)validate_FieldRules_duration(msg); @@ -732,7 +732,7 @@ UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(v } UPB_INLINE void validate_FieldRules_set_timestamp(validate_FieldRules *msg, validate_TimestampRules* value) { const upb_MiniTableField field = {22, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_TimestampRules* validate_FieldRules_mutable_timestamp(validate_FieldRules* msg, upb_Arena* arena) { struct validate_TimestampRules* sub = (struct validate_TimestampRules*)validate_FieldRules_timestamp(msg); @@ -942,23 +942,23 @@ UPB_INLINE bool validate_FloatRules_has_ignore_empty(const validate_FloatRules* UPB_INLINE void validate_FloatRules_set_const(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_lt(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_lte(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_gt(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_gte(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE float* validate_FloatRules_mutable_in(validate_FloatRules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1018,7 +1018,7 @@ UPB_INLINE bool validate_FloatRules_add_not_in(validate_FloatRules* msg, float v } UPB_INLINE void validate_FloatRules_set_ignore_empty(validate_FloatRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.DoubleRules */ @@ -1220,23 +1220,23 @@ UPB_INLINE bool validate_DoubleRules_has_ignore_empty(const validate_DoubleRules UPB_INLINE void validate_DoubleRules_set_const(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_lt(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_lte(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_gt(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_gte(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE double* validate_DoubleRules_mutable_in(validate_DoubleRules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1296,7 +1296,7 @@ UPB_INLINE bool validate_DoubleRules_add_not_in(validate_DoubleRules* msg, doubl } UPB_INLINE void validate_DoubleRules_set_ignore_empty(validate_DoubleRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Int32Rules */ @@ -1498,23 +1498,23 @@ UPB_INLINE bool validate_Int32Rules_has_ignore_empty(const validate_Int32Rules* UPB_INLINE void validate_Int32Rules_set_const(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_lt(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_lte(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_gt(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_gte(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_Int32Rules_mutable_in(validate_Int32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1574,7 +1574,7 @@ UPB_INLINE bool validate_Int32Rules_add_not_in(validate_Int32Rules* msg, int32_t } UPB_INLINE void validate_Int32Rules_set_ignore_empty(validate_Int32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Int64Rules */ @@ -1776,23 +1776,23 @@ UPB_INLINE bool validate_Int64Rules_has_ignore_empty(const validate_Int64Rules* UPB_INLINE void validate_Int64Rules_set_const(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_lt(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_lte(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_gt(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_gte(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_Int64Rules_mutable_in(validate_Int64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1852,7 +1852,7 @@ UPB_INLINE bool validate_Int64Rules_add_not_in(validate_Int64Rules* msg, int64_t } UPB_INLINE void validate_Int64Rules_set_ignore_empty(validate_Int64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.UInt32Rules */ @@ -2054,23 +2054,23 @@ UPB_INLINE bool validate_UInt32Rules_has_ignore_empty(const validate_UInt32Rules UPB_INLINE void validate_UInt32Rules_set_const(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_lt(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_lte(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_gt(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_gte(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* validate_UInt32Rules_mutable_in(validate_UInt32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2130,7 +2130,7 @@ UPB_INLINE bool validate_UInt32Rules_add_not_in(validate_UInt32Rules* msg, uint3 } UPB_INLINE void validate_UInt32Rules_set_ignore_empty(validate_UInt32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.UInt64Rules */ @@ -2332,23 +2332,23 @@ UPB_INLINE bool validate_UInt64Rules_has_ignore_empty(const validate_UInt64Rules UPB_INLINE void validate_UInt64Rules_set_const(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_lt(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_lte(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_gt(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_gte(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint64_t* validate_UInt64Rules_mutable_in(validate_UInt64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2408,7 +2408,7 @@ UPB_INLINE bool validate_UInt64Rules_add_not_in(validate_UInt64Rules* msg, uint6 } UPB_INLINE void validate_UInt64Rules_set_ignore_empty(validate_UInt64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SInt32Rules */ @@ -2610,23 +2610,23 @@ UPB_INLINE bool validate_SInt32Rules_has_ignore_empty(const validate_SInt32Rules UPB_INLINE void validate_SInt32Rules_set_const(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_lt(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_lte(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_gt(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_gte(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_SInt32Rules_mutable_in(validate_SInt32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2686,7 +2686,7 @@ UPB_INLINE bool validate_SInt32Rules_add_not_in(validate_SInt32Rules* msg, int32 } UPB_INLINE void validate_SInt32Rules_set_ignore_empty(validate_SInt32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SInt64Rules */ @@ -2888,23 +2888,23 @@ UPB_INLINE bool validate_SInt64Rules_has_ignore_empty(const validate_SInt64Rules UPB_INLINE void validate_SInt64Rules_set_const(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_lt(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_lte(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_gt(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_gte(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_SInt64Rules_mutable_in(validate_SInt64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2964,7 +2964,7 @@ UPB_INLINE bool validate_SInt64Rules_add_not_in(validate_SInt64Rules* msg, int64 } UPB_INLINE void validate_SInt64Rules_set_ignore_empty(validate_SInt64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Fixed32Rules */ @@ -3166,23 +3166,23 @@ UPB_INLINE bool validate_Fixed32Rules_has_ignore_empty(const validate_Fixed32Rul UPB_INLINE void validate_Fixed32Rules_set_const(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_lt(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_lte(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_gt(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_gte(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* validate_Fixed32Rules_mutable_in(validate_Fixed32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3242,7 +3242,7 @@ UPB_INLINE bool validate_Fixed32Rules_add_not_in(validate_Fixed32Rules* msg, uin } UPB_INLINE void validate_Fixed32Rules_set_ignore_empty(validate_Fixed32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Fixed64Rules */ @@ -3444,23 +3444,23 @@ UPB_INLINE bool validate_Fixed64Rules_has_ignore_empty(const validate_Fixed64Rul UPB_INLINE void validate_Fixed64Rules_set_const(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_lt(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_lte(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_gt(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_gte(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint64_t* validate_Fixed64Rules_mutable_in(validate_Fixed64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3520,7 +3520,7 @@ UPB_INLINE bool validate_Fixed64Rules_add_not_in(validate_Fixed64Rules* msg, uin } UPB_INLINE void validate_Fixed64Rules_set_ignore_empty(validate_Fixed64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SFixed32Rules */ @@ -3722,23 +3722,23 @@ UPB_INLINE bool validate_SFixed32Rules_has_ignore_empty(const validate_SFixed32R UPB_INLINE void validate_SFixed32Rules_set_const(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_lt(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_lte(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_gt(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_gte(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_SFixed32Rules_mutable_in(validate_SFixed32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3798,7 +3798,7 @@ UPB_INLINE bool validate_SFixed32Rules_add_not_in(validate_SFixed32Rules* msg, i } UPB_INLINE void validate_SFixed32Rules_set_ignore_empty(validate_SFixed32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SFixed64Rules */ @@ -4000,23 +4000,23 @@ UPB_INLINE bool validate_SFixed64Rules_has_ignore_empty(const validate_SFixed64R UPB_INLINE void validate_SFixed64Rules_set_const(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_lt(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_lte(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_gt(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_gte(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_SFixed64Rules_mutable_in(validate_SFixed64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4076,7 +4076,7 @@ UPB_INLINE bool validate_SFixed64Rules_add_not_in(validate_SFixed64Rules* msg, i } UPB_INLINE void validate_SFixed64Rules_set_ignore_empty(validate_SFixed64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.BoolRules */ @@ -4134,7 +4134,7 @@ UPB_INLINE bool validate_BoolRules_has_const(const validate_BoolRules* msg) { UPB_INLINE void validate_BoolRules_set_const(validate_BoolRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.StringRules */ @@ -4642,39 +4642,39 @@ UPB_INLINE bool validate_StringRules_has_ignore_empty(const validate_StringRules UPB_INLINE void validate_StringRules_set_const(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_min_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {2, 40, 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_max_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {3, 48, 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_min_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {4, 56, 67, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_max_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {5, 64, 68, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_pattern(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {6, 72, 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_prefix(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(80, 88), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_suffix(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(88, 104), 71, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_contains(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(96, 120), 72, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_StringRules_mutable_in(validate_StringRules* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(12, 136), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4734,63 +4734,63 @@ UPB_INLINE bool validate_StringRules_add_not_in(validate_StringRules* msg, upb_S } UPB_INLINE void validate_StringRules_set_email(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_hostname(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {13, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ip(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ipv4(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ipv6(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {16, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uri(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uri_ref(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {19, UPB_SIZE(104, 152), 73, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_len_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {20, UPB_SIZE(112, 160), 74, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_address(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uuid(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_not_contains(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {23, UPB_SIZE(120, 168), 75, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_well_known_regex(validate_StringRules *msg, int32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_strict(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(24, 16), 76, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ignore_empty(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(25, 17), 77, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.BytesRules */ @@ -5099,31 +5099,31 @@ UPB_INLINE bool validate_BytesRules_has_ignore_empty(const validate_BytesRules* UPB_INLINE void validate_BytesRules_set_const(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_min_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {2, 40, 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_max_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {3, 48, 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_pattern(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {4, 56, 67, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_prefix(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(64, 72), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_suffix(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(72, 88), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_contains(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(80, 104), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_BytesRules_mutable_in(validate_BytesRules* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(12, 120), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5183,23 +5183,23 @@ UPB_INLINE bool validate_BytesRules_add_not_in(validate_BytesRules* msg, upb_Str } UPB_INLINE void validate_BytesRules_set_ip(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {10, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ipv4(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {11, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ipv6(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {12, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {13, UPB_SIZE(88, 136), 71, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ignore_empty(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(24, 16), 72, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.EnumRules */ @@ -5337,11 +5337,11 @@ UPB_INLINE upb_Array* _validate_EnumRules_not_in_mutable_upb_array(validate_Enum UPB_INLINE void validate_EnumRules_set_const(validate_EnumRules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_EnumRules_set_defined_only(validate_EnumRules *msg, bool value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_EnumRules_mutable_in(validate_EnumRules* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5471,11 +5471,11 @@ UPB_INLINE bool validate_MessageRules_has_required(const validate_MessageRules* UPB_INLINE void validate_MessageRules_set_skip(validate_MessageRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MessageRules_set_required(validate_MessageRules *msg, bool value) { const upb_MiniTableField field = {2, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.RepeatedRules */ @@ -5597,19 +5597,19 @@ UPB_INLINE bool validate_RepeatedRules_has_ignore_empty(const validate_RepeatedR UPB_INLINE void validate_RepeatedRules_set_min_items(validate_RepeatedRules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_max_items(validate_RepeatedRules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_unique(validate_RepeatedRules *msg, bool value) { const upb_MiniTableField field = {3, 9, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_items(validate_RepeatedRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(validate_RepeatedRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_RepeatedRules_items(msg); @@ -5621,7 +5621,7 @@ UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(vali } UPB_INLINE void validate_RepeatedRules_set_ignore_empty(validate_RepeatedRules *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 10), 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.MapRules */ @@ -5759,19 +5759,19 @@ UPB_INLINE bool validate_MapRules_has_ignore_empty(const validate_MapRules* msg) UPB_INLINE void validate_MapRules_set_min_pairs(validate_MapRules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_max_pairs(validate_MapRules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_no_sparse(validate_MapRules *msg, bool value) { const upb_MiniTableField field = {3, 9, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_keys(validate_MapRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_MapRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_keys(msg); @@ -5783,7 +5783,7 @@ UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_M } UPB_INLINE void validate_MapRules_set_values(validate_MapRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 68, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate_MapRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_values(msg); @@ -5795,7 +5795,7 @@ UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate } UPB_INLINE void validate_MapRules_set_ignore_empty(validate_MapRules *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 10), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.AnyRules */ @@ -5917,7 +5917,7 @@ UPB_INLINE upb_Array* _validate_AnyRules_not_in_mutable_upb_array(validate_AnyRu UPB_INLINE void validate_AnyRules_set_required(validate_AnyRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_AnyRules_mutable_in(validate_AnyRules* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6175,11 +6175,11 @@ UPB_INLINE upb_Array* _validate_DurationRules_not_in_mutable_upb_array(validate_ UPB_INLINE void validate_DurationRules_set_required(validate_DurationRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DurationRules_set_const(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_const(msg); @@ -6191,7 +6191,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const } UPB_INLINE void validate_DurationRules_set_lt(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lt(msg); @@ -6203,7 +6203,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(va } UPB_INLINE void validate_DurationRules_set_lte(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 67, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lte(msg); @@ -6215,7 +6215,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(v } UPB_INLINE void validate_DurationRules_set_gt(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 68, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gt(msg); @@ -6227,7 +6227,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(va } UPB_INLINE void validate_DurationRules_set_gte(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 69, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gte(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gte(msg); @@ -6481,11 +6481,11 @@ UPB_INLINE bool validate_TimestampRules_has_within(const validate_TimestampRules UPB_INLINE void validate_TimestampRules_set_required(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {1, 10, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_const(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_const(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_const(msg); @@ -6497,7 +6497,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_con } UPB_INLINE void validate_TimestampRules_set_lt(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lt(msg); @@ -6509,7 +6509,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt( } UPB_INLINE void validate_TimestampRules_set_lte(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 67, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lte(msg); @@ -6521,7 +6521,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte } UPB_INLINE void validate_TimestampRules_set_gt(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 68, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gt(msg); @@ -6533,7 +6533,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt( } UPB_INLINE void validate_TimestampRules_set_gte(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 69, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gte(msg); @@ -6545,15 +6545,15 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte } UPB_INLINE void validate_TimestampRules_set_lt_now(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 11), 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_gt_now(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(33, 12), 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_within(validate_TimestampRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 72, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_TimestampRules_mutable_within(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_TimestampRules_within(msg); @@ -6585,7 +6585,7 @@ UPB_INLINE void validate_set_disabled(struct google_protobuf_MessageOptions* msg UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_ignored(const struct google_protobuf_MessageOptions* msg) { @@ -6609,7 +6609,7 @@ UPB_INLINE void validate_set_ignored(struct google_protobuf_MessageOptions* msg, UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_required(const struct google_protobuf_OneofOptions* msg) { @@ -6633,7 +6633,7 @@ UPB_INLINE void validate_set_required(struct google_protobuf_OneofOptions* msg, UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_rules(const struct google_protobuf_FieldOptions* msg) { @@ -6657,9 +6657,18 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct validate_FieldRules* validate_mutable_rules(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_rules(msg); + if (sub == NULL) { + sub = (struct validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena); + if (sub) validate_set_rules(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/validate/validate.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/validate/validate.upb_minitable.c index 5a4d4dcc47..66aa1f4bc8 100644 --- a/deps/grpc/src/core/ext/upb-gen/validate/validate.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/validate/validate.upb_minitable.c @@ -69,6 +69,9 @@ const upb_MiniTable validate__FieldRules_msg_init = { &validate_FieldRules_submsgs[0], &validate_FieldRules__fields[0], UPB_SIZE(24, 32), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "validate.FieldRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -120,6 +123,9 @@ const upb_MiniTable validate__FloatRules_msg_init = { NULL, &validate_FloatRules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.FloatRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -147,6 +153,9 @@ const upb_MiniTable validate__DoubleRules_msg_init = { NULL, &validate_DoubleRules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.DoubleRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -174,6 +183,9 @@ const upb_MiniTable validate__Int32Rules_msg_init = { NULL, &validate_Int32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Int32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -201,6 +213,9 @@ const upb_MiniTable validate__Int64Rules_msg_init = { NULL, &validate_Int64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Int64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -228,6 +243,9 @@ const upb_MiniTable validate__UInt32Rules_msg_init = { NULL, &validate_UInt32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.UInt32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -255,6 +273,9 @@ const upb_MiniTable validate__UInt64Rules_msg_init = { NULL, &validate_UInt64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.UInt64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -282,6 +303,9 @@ const upb_MiniTable validate__SInt32Rules_msg_init = { NULL, &validate_SInt32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SInt32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -309,6 +333,9 @@ const upb_MiniTable validate__SInt64Rules_msg_init = { NULL, &validate_SInt64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SInt64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -336,6 +363,9 @@ const upb_MiniTable validate__Fixed32Rules_msg_init = { NULL, &validate_Fixed32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Fixed32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -363,6 +393,9 @@ const upb_MiniTable validate__Fixed64Rules_msg_init = { NULL, &validate_Fixed64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Fixed64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -390,6 +423,9 @@ const upb_MiniTable validate__SFixed32Rules_msg_init = { NULL, &validate_SFixed32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SFixed32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -417,6 +453,9 @@ const upb_MiniTable validate__SFixed64Rules_msg_init = { NULL, &validate_SFixed64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SFixed64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -437,6 +476,9 @@ const upb_MiniTable validate__BoolRules_msg_init = { NULL, &validate_BoolRules__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.BoolRules", +#endif }; static const upb_MiniTableSub validate_StringRules_submsgs[1] = { @@ -476,6 +518,9 @@ const upb_MiniTable validate__StringRules_msg_init = { &validate_StringRules_submsgs[0], &validate_StringRules__fields[0], UPB_SIZE(128, 184), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "validate.StringRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -533,6 +578,9 @@ const upb_MiniTable validate__BytesRules_msg_init = { NULL, &validate_BytesRules__fields[0], UPB_SIZE(96, 144), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "validate.BytesRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -564,6 +612,9 @@ const upb_MiniTable validate__EnumRules_msg_init = { NULL, &validate_EnumRules__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.EnumRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -585,6 +636,9 @@ const upb_MiniTable validate__MessageRules_msg_init = { NULL, &validate_MessageRules__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.MessageRules", +#endif }; static const upb_MiniTableSub validate_RepeatedRules_submsgs[1] = { @@ -603,6 +657,9 @@ const upb_MiniTable validate__RepeatedRules_msg_init = { &validate_RepeatedRules_submsgs[0], &validate_RepeatedRules__fields[0], 40, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.RepeatedRules", +#endif }; static const upb_MiniTableSub validate_MapRules_submsgs[2] = { @@ -623,6 +680,9 @@ const upb_MiniTable validate__MapRules_msg_init = { &validate_MapRules_submsgs[0], &validate_MapRules__fields[0], UPB_SIZE(40, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.MapRules", +#endif }; static const upb_MiniTableField validate_AnyRules__fields[3] = { @@ -635,6 +695,9 @@ const upb_MiniTable validate__AnyRules_msg_init = { NULL, &validate_AnyRules__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "validate.AnyRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -668,6 +731,9 @@ const upb_MiniTable validate__DurationRules_msg_init = { &validate_DurationRules_submsgs[0], &validate_DurationRules__fields[0], UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "validate.DurationRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -713,6 +779,9 @@ const upb_MiniTable validate__TimestampRules_msg_init = { &validate_TimestampRules_submsgs[0], &validate_TimestampRules__fields[0], UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.TimestampRules", +#endif }; static const upb_MiniTable *messages_layout[23] = { diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h index 78dee03154..9fc55da1e5 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h @@ -83,7 +83,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_MigrateAnnotation_rename(const xds_ UPB_INLINE void xds_annotations_v3_MigrateAnnotation_set_rename(xds_annotations_v3_MigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FieldMigrateAnnotation */ @@ -149,11 +149,11 @@ UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_oneof_promot UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_rename(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FileMigrateAnnotation */ @@ -207,7 +207,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_FileMigrateAnnotation_move_to_packa UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_set_move_to_package(xds_annotations_v3_FileMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_message_migrate(const struct google_protobuf_MessageOptions* msg) { @@ -231,9 +231,18 @@ UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_Me UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_message_migrate(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_message_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_message_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_field_migrate(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_field_migrate_ext); } @@ -255,9 +264,18 @@ UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_Fiel UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_mutable_field_migrate(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldMigrateAnnotation* sub = (struct xds_annotations_v3_FieldMigrateAnnotation*)xds_annotations_v3_field_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldMigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_field_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_enum_migrate_ext); } @@ -279,9 +297,18 @@ UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_enum_migrate(struct google_protobuf_EnumOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_enum_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_enum_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_enum_value_migrate_ext); } @@ -303,9 +330,18 @@ UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_enum_value_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_enum_value_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_file_migrate(const struct google_protobuf_FileOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_file_migrate_ext); } @@ -327,9 +363,18 @@ UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_mutable_file_migrate(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FileMigrateAnnotation* sub = (struct xds_annotations_v3_FileMigrateAnnotation*)xds_annotations_v3_file_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FileMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FileMigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_file_migrate(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c index 0ec954ec80..570b583b8f 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__MigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_MigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.MigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldMigrateAnnotation__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -52,6 +58,9 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_FileMigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FileMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h index 21321c4992..fe5581455e 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h @@ -90,11 +90,11 @@ UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrust UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_security(const struct google_protobuf_FieldOptions* msg) { @@ -118,9 +118,18 @@ UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOpti UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_mutable_security(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldSecurityAnnotation* sub = (struct xds_annotations_v3_FieldSecurityAnnotation*)xds_annotations_v3_security(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldSecurityAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldSecurityAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_security(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c index 1bf8186264..a411f41bd3 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldSecurityAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldSecurityAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h index b9f504553b..4202d1329b 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h @@ -45,7 +45,7 @@ UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h index 1206175340..867d46ff89 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h @@ -89,7 +89,7 @@ UPB_INLINE bool xds_annotations_v3_FileStatusAnnotation_work_in_progress(const x UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_set_work_in_progress(xds_annotations_v3_FileStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.MessageStatusAnnotation */ @@ -143,7 +143,7 @@ UPB_INLINE bool xds_annotations_v3_MessageStatusAnnotation_work_in_progress(cons UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_set_work_in_progress(xds_annotations_v3_MessageStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FieldStatusAnnotation */ @@ -197,7 +197,7 @@ UPB_INLINE bool xds_annotations_v3_FieldStatusAnnotation_work_in_progress(const UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_set_work_in_progress(xds_annotations_v3_FieldStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.StatusAnnotation */ @@ -263,11 +263,11 @@ UPB_INLINE int32_t xds_annotations_v3_StatusAnnotation_package_version_status(co UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_work_in_progress(xds_annotations_v3_StatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_package_version_status(xds_annotations_v3_StatusAnnotation *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_file_status(const struct google_protobuf_FileOptions* msg) { @@ -291,9 +291,18 @@ UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOp UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_mutable_file_status(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FileStatusAnnotation* sub = (struct xds_annotations_v3_FileStatusAnnotation*)xds_annotations_v3_file_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FileStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FileStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_file_status(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_message_status(const struct google_protobuf_MessageOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_message_status_ext); } @@ -315,9 +324,18 @@ UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_Mes UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_mutable_message_status(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MessageStatusAnnotation* sub = (struct xds_annotations_v3_MessageStatusAnnotation*)xds_annotations_v3_message_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MessageStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__MessageStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_message_status(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_field_status(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_field_status_ext); } @@ -339,9 +357,18 @@ UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_Field UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_mutable_field_status(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldStatusAnnotation* sub = (struct xds_annotations_v3_FieldStatusAnnotation*)xds_annotations_v3_field_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_field_status(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c index ff3dcf7a52..c8cab7e5a0 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__FileStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_FileStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FileStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -35,6 +38,9 @@ const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_MessageStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.MessageStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -49,6 +55,9 @@ const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -64,6 +73,9 @@ const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = { NULL, &xds_annotations_v3_StatusAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.StatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h index 37015c4ad5..fb7184e38e 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_VersioningAnnotation_previous_messa UPB_INLINE void xds_annotations_v3_VersioningAnnotation_set_previous_message_type(xds_annotations_v3_VersioningAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_versioning(const struct google_protobuf_MessageOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_Message UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_mutable_versioning(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_VersioningAnnotation* sub = (struct xds_annotations_v3_VersioningAnnotation*)xds_annotations_v3_versioning(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_VersioningAnnotation*)_upb_Message_New(&xds__annotations__v3__VersioningAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_versioning(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c index 209d9b96e6..3db8d2f343 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = { NULL, &xds_annotations_v3_VersioningAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.VersioningAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb.h index 339c035c80..9355bf2bf0 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView xds_core_v3_Authority_name(const xds_core_v3_Authority UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c index e8d1a4fd7b..64456c1e22 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable xds__core__v3__Authority_msg_init = { NULL, &xds_core_v3_Authority__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.Authority", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h index 07c6c89176..bdecd9f387 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h @@ -95,11 +95,11 @@ UPB_INLINE bool xds_core_v3_CidrRange_has_prefix_len(const xds_core_v3_CidrRange UPB_INLINE void xds_core_v3_CidrRange_set_address_prefix(xds_core_v3_CidrRange *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CidrRange_set_prefix_len(xds_core_v3_CidrRange *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_mutable_prefix_len(xds_core_v3_CidrRange* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)xds_core_v3_CidrRange_prefix_len(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c index f6db7cfd7c..d9a0b22a01 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__core__v3__CidrRange_msg_init = { &xds_core_v3_CidrRange_submsgs[0], &xds_core_v3_CidrRange__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CidrRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h index 79f21a9525..e8329930b9 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h @@ -112,7 +112,7 @@ UPB_INLINE bool xds_core_v3_CollectionEntry_has_inline_entry(const xds_core_v3_C UPB_INLINE void xds_core_v3_CollectionEntry_set_locator(xds_core_v3_CollectionEntry *msg, struct xds_core_v3_ResourceLocator* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_mutable_locator(xds_core_v3_CollectionEntry* msg, upb_Arena* arena) { struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_CollectionEntry_locator(msg); @@ -124,7 +124,7 @@ UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_mutab } UPB_INLINE void xds_core_v3_CollectionEntry_set_inline_entry(xds_core_v3_CollectionEntry *msg, xds_core_v3_CollectionEntry_InlineEntry* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_mutable_inline_entry(xds_core_v3_CollectionEntry* msg, upb_Arena* arena) { struct xds_core_v3_CollectionEntry_InlineEntry* sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)xds_core_v3_CollectionEntry_inline_entry(msg); @@ -214,15 +214,15 @@ UPB_INLINE bool xds_core_v3_CollectionEntry_InlineEntry_has_resource(const xds_c UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_name(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_version(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_resource(xds_core_v3_CollectionEntry_InlineEntry *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_mutable_resource(xds_core_v3_CollectionEntry_InlineEntry* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_CollectionEntry_InlineEntry_resource(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c index c82d17e053..6c8e87593a 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = { &xds_core_v3_CollectionEntry_submsgs[0], &xds_core_v3_CollectionEntry__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CollectionEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -52,6 +55,9 @@ const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = { &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0], &xds_core_v3_CollectionEntry_InlineEntry__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CollectionEntry.InlineEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c index 23af64f7ce..4f074de292 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable xds__core__v3__ContextParams_msg_init = { &xds_core_v3_ContextParams_submsgs[0], &xds_core_v3_ContextParams__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ContextParams", +#endif }; static const upb_MiniTableField xds_core_v3_ContextParams_ParamsEntry__fields[2] = { @@ -36,6 +39,9 @@ const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init = { NULL, &xds_core_v3_ContextParams_ParamsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ContextParams.ParamsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb.h index 70fa76ce3e..5411471196 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb.h @@ -94,11 +94,11 @@ UPB_INLINE bool xds_core_v3_TypedExtensionConfig_has_typed_config(const xds_core UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_name(xds_core_v3_TypedExtensionConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_typed_config(xds_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_typed_config(xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_TypedExtensionConfig_typed_config(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c index b96a04cb39..6ebd911796 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = { &xds_core_v3_TypedExtensionConfig_submsgs[0], &xds_core_v3_TypedExtensionConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.TypedExtensionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb.h index 6d188c4322..3bddecbb0a 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb.h @@ -112,7 +112,7 @@ UPB_INLINE bool xds_core_v3_Resource_has_resource(const xds_core_v3_Resource* ms UPB_INLINE void xds_core_v3_Resource_set_name(xds_core_v3_Resource *msg, struct xds_core_v3_ResourceName* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xds_core_v3_Resource* msg, upb_Arena* arena) { struct xds_core_v3_ResourceName* sub = (struct xds_core_v3_ResourceName*)xds_core_v3_Resource_name(msg); @@ -124,11 +124,11 @@ UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xd } UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_Resource_set_resource(xds_core_v3_Resource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds_core_v3_Resource* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_Resource_resource(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c index 4e71b3cf0a..15ba4b9dd2 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__Resource_msg_init = { &xds_core_v3_Resource_submsgs[0], &xds_core_v3_Resource__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.Resource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h index 0e3b95331b..a5ad60883e 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h @@ -179,23 +179,23 @@ UPB_INLINE upb_Array* _xds_core_v3_ResourceLocator_directives_mutable_upb_array( UPB_INLINE void xds_core_v3_ResourceLocator_set_scheme(xds_core_v3_ResourceLocator *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_id(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_authority(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_resource_type(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_exact_context(xds_core_v3_ResourceLocator *msg, struct xds_core_v3_ContextParams* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 72), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_mutable_exact_context(xds_core_v3_ResourceLocator* msg, upb_Arena* arena) { struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceLocator_exact_context(msg); @@ -317,7 +317,7 @@ UPB_INLINE bool xds_core_v3_ResourceLocator_Directive_has_entry(const xds_core_v UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_alt(xds_core_v3_ResourceLocator_Directive *msg, xds_core_v3_ResourceLocator* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Directive_mutable_alt(xds_core_v3_ResourceLocator_Directive* msg, upb_Arena* arena) { struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_ResourceLocator_Directive_alt(msg); @@ -329,7 +329,7 @@ UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Direc } UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_ResourceLocator_Directive *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c index 6c1887cb08..c46929c95d 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = { &xds_core_v3_ResourceLocator_submsgs[0], &xds_core_v3_ResourceLocator__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceLocator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = { &xds_core_v3_ResourceLocator_Directive_submsgs[0], &xds_core_v3_ResourceLocator_Directive__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceLocator.Directive", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h index 8dbc106d7a..0b99122aaa 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h @@ -119,19 +119,19 @@ UPB_INLINE bool xds_core_v3_ResourceName_has_context(const xds_core_v3_ResourceN UPB_INLINE void xds_core_v3_ResourceName_set_id(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_authority(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_resource_type(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_context(xds_core_v3_ResourceName *msg, struct xds_core_v3_ContextParams* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_context(xds_core_v3_ResourceName* msg, upb_Arena* arena) { struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceName_context(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c index c8ef95ba38..abba90d31a 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__ResourceName_msg_init = { &xds_core_v3_ResourceName_submsgs[0], &xds_core_v3_ResourceName__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h index ad74a59e8b..f7d3384749 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h @@ -226,15 +226,15 @@ UPB_INLINE double xds_data_orca_v3_OrcaLoadReport_application_utilization(const UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_cpu_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_mem_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_rps(xds_data_orca_v3_OrcaLoadReport *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_request_cost_clear(xds_data_orca_v3_OrcaLoadReport* msg) { const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -288,11 +288,11 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* xds_data_orca_v3_Or } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_rps_fractional(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {6, 48, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_eps(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {7, 56, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_named_metrics_clear(xds_data_orca_v3_OrcaLoadReport* msg) { const upb_MiniTableField field = {8, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -321,7 +321,7 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* xds_data_orca_v3_O } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_application_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {9, UPB_SIZE(64, 72), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.data.orca.v3.OrcaLoadReport.RequestCostEntry */ diff --git a/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c index 9b77741448..ebc43f2414 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = { &xds_data_orca_v3_OrcaLoadReport_submsgs[0], &xds_data_orca_v3_OrcaLoadReport__fields[0], UPB_SIZE(72, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -64,6 +67,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_in NULL, &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.RequestCostEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -81,6 +87,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_in NULL, &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.UtilizationEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -98,6 +107,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_i NULL, &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.NamedMetricsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h index f6b9d554be..1251525374 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h @@ -114,7 +114,7 @@ UPB_INLINE upb_Array* _xds_service_orca_v3_OrcaLoadReportRequest_request_cost_na UPB_INLINE void xds_service_orca_v3_OrcaLoadReportRequest_set_report_interval(xds_service_orca_v3_OrcaLoadReportRequest *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* xds_service_orca_v3_OrcaLoadReportRequest_mutable_report_interval(xds_service_orca_v3_OrcaLoadReportRequest* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)xds_service_orca_v3_OrcaLoadReportRequest_report_interval(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c index 4d1115488b..9966e81957 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = { &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0], &xds_service_orca_v3_OrcaLoadReportRequest__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.service.orca.v3.OrcaLoadReportRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h index 31a8183b15..59677d3bfd 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h @@ -95,7 +95,7 @@ UPB_INLINE upb_StringView xds_type_matcher_v3_CelMatcher_description(const xds_t UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_expr_match(xds_type_matcher_v3_CelMatcher *msg, struct xds_type_v3_CelExpression* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_mutable_expr_match(xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena) { struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_matcher_v3_CelMatcher_expr_match(msg); @@ -107,7 +107,7 @@ UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_muta } UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_description(xds_type_matcher_v3_CelMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c index 454462a87b..cf4ef830b8 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = { &xds_type_matcher_v3_CelMatcher_submsgs[0], &xds_type_matcher_v3_CelMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.CelMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h index f8c3bde073..e422eb7dac 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h @@ -244,7 +244,7 @@ UPB_INLINE bool xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_add_domains( } UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_set_on_match(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_mutable_on_match(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_on_match(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c index fe22f0af3d..70b99bb3c1 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = { &xds_type_matcher_v3_ServerNameMatcher_submsgs[0], &xds_type_matcher_v3_ServerNameMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ServerNameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0], &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ServerNameMatcher.DomainMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c index 5894814966..fa192d078e 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c @@ -17,6 +17,9 @@ const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.HttpAttributesCelMatchInput", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h index ae1c695c82..19a72d7185 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h @@ -260,7 +260,7 @@ UPB_INLINE struct xds_core_v3_CidrRange* xds_type_matcher_v3_IPMatcher_IPRangeMa } UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_on_match(xds_type_matcher_v3_IPMatcher_IPRangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_mutable_on_match(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_IPMatcher_IPRangeMatcher_on_match(msg); @@ -272,7 +272,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_IPMat } UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_type_matcher_v3_IPMatcher_IPRangeMatcher *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c index c79e418bae..7ec8ac3ee3 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = { &xds_type_matcher_v3_IPMatcher_submsgs[0], &xds_type_matcher_v3_IPMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.IPMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -49,6 +52,9 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0], &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.IPMatcher.IPRangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h index 003d670688..1a79889304 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h @@ -136,7 +136,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_has_on_no_match(const xds_type_match UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_list(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherList* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_mutable_matcher_list(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)xds_type_matcher_v3_Matcher_matcher_list(msg); @@ -148,7 +148,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_M } UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_tree(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherTree* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_mutable_matcher_tree(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)xds_type_matcher_v3_Matcher_matcher_tree(msg); @@ -160,7 +160,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_M } UPB_INLINE void xds_type_matcher_v3_Matcher_set_on_no_match(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_mutable_on_no_match(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_on_no_match(msg); @@ -252,7 +252,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_action(const xds_type_ma UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_matcher(xds_type_matcher_v3_Matcher_OnMatch *msg, xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_mutable_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)xds_type_matcher_v3_Matcher_OnMatch_matcher(msg); @@ -264,7 +264,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMat } UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_action(xds_type_matcher_v3_Matcher_OnMatch *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_mutable_action(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_OnMatch_action(msg); @@ -490,7 +490,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_not_matche UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg); @@ -502,7 +502,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredic } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg); @@ -514,7 +514,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateLis } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg); @@ -526,7 +526,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateLis } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg); @@ -634,7 +634,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicat UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg); @@ -646,7 +646,7 @@ UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_ } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg); @@ -658,7 +658,7 @@ UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg); @@ -840,7 +840,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_matc UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg); @@ -852,7 +852,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_ma } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg); @@ -977,7 +977,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_custom_match(const x UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_input(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_input(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_input(msg); @@ -989,7 +989,7 @@ UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_ } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(msg); @@ -1001,7 +1001,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_mat } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg); @@ -1013,7 +1013,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_mat } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_custom_match(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c index fd7f588ecc..f9abc865fd 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = { &xds_type_matcher_v3_Matcher_submsgs[0], &xds_type_matcher_v3_Matcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -54,6 +57,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = { &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0], &xds_type_matcher_v3_Matcher_OnMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.OnMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -74,6 +80,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = { &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -98,6 +107,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_ &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -126,6 +138,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -146,6 +161,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -166,6 +184,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher", +#endif }; static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = { @@ -186,6 +207,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = { &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -210,6 +234,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap", +#endif }; static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { @@ -225,6 +252,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapE &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h index a53ce4171c..d90b2630d9 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h @@ -253,7 +253,7 @@ UPB_INLINE struct xds_type_v3_Int64Range* xds_type_matcher_v3_Int64RangeMatcher_ } UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(msg); @@ -481,7 +481,7 @@ UPB_INLINE struct xds_type_v3_Int32Range* xds_type_matcher_v3_Int32RangeMatcher_ } UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(msg); @@ -709,7 +709,7 @@ UPB_INLINE struct xds_type_v3_DoubleRange* xds_type_matcher_v3_DoubleRangeMatche } UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c index ee96c92348..7efdcfa5f7 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = { &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int64RangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int64RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -47,6 +50,9 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_ &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -65,6 +71,9 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = { &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int32RangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int32RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -85,6 +94,9 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_ &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -103,6 +115,9 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = { &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0], &xds_type_matcher_v3_DoubleRangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.DoubleRangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -123,6 +138,9 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h index 6dcb755fed..0c0bec69b4 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h @@ -102,7 +102,7 @@ UPB_INLINE upb_StringView xds_type_matcher_v3_RegexMatcher_regex(const xds_type_ UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_google_re2(xds_type_matcher_v3_RegexMatcher *msg, xds_type_matcher_v3_RegexMatcher_GoogleRE2* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_mutable_google_re2(xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)xds_type_matcher_v3_RegexMatcher_google_re2(msg); @@ -114,7 +114,7 @@ UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v } UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_regex(xds_type_matcher_v3_RegexMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.matcher.v3.RegexMatcher.GoogleRE2 */ diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c index 0817ae4afa..5e59b7a8be 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = { &xds_type_matcher_v3_RegexMatcher_submsgs[0], &xds_type_matcher_v3_RegexMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.RegexMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000080100000a, &upb_pom_1bt_max64b}, @@ -38,6 +41,9 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.RegexMatcher.GoogleRE2", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h index ab137e83ba..17a8b31aba 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h @@ -172,19 +172,19 @@ UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_contains(const xds_type_ma UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_exact(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_prefix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_suffix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_safe_regex(xds_type_matcher_v3_StringMatcher *msg, struct xds_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_mutable_safe_regex(xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_RegexMatcher* sub = (struct xds_type_matcher_v3_RegexMatcher*)xds_type_matcher_v3_StringMatcher_safe_regex(msg); @@ -196,11 +196,11 @@ UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMa } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_ignore_case(xds_type_matcher_v3_StringMatcher *msg, bool value) { const upb_MiniTableField field = {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_contains(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.matcher.v3.ListStringMatcher */ diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c index 1af3b33c9f..028473e84c 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = { &xds_type_matcher_v3_StringMatcher_submsgs[0], &xds_type_matcher_v3_StringMatcher__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.StringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -55,6 +58,9 @@ const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = { &xds_type_matcher_v3_ListStringMatcher_submsgs[0], &xds_type_matcher_v3_ListStringMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ListStringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb.h index 153de8ebaf..6cb6070a2e 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb.h @@ -114,7 +114,7 @@ UPB_INLINE bool xds_type_v3_CelExpression_has_checked_expr(const xds_type_v3_Cel UPB_INLINE void xds_type_v3_CelExpression_set_parsed_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_ParsedExpr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_mutable_parsed_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_ParsedExpr* sub = (struct google_api_expr_v1alpha1_ParsedExpr*)xds_type_v3_CelExpression_parsed_expr(msg); @@ -126,7 +126,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression } UPB_INLINE void xds_type_v3_CelExpression_set_checked_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_mutable_checked_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)xds_type_v3_CelExpression_checked_expr(msg); @@ -208,7 +208,7 @@ UPB_INLINE bool xds_type_v3_CelExtractString_has_default_value(const xds_type_v3 UPB_INLINE void xds_type_v3_CelExtractString_set_expr_extract(xds_type_v3_CelExtractString *msg, xds_type_v3_CelExpression* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutable_expr_extract(xds_type_v3_CelExtractString* msg, upb_Arena* arena) { struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_v3_CelExtractString_expr_extract(msg); @@ -220,7 +220,7 @@ UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutabl } UPB_INLINE void xds_type_v3_CelExtractString_set_default_value(xds_type_v3_CelExtractString *msg, struct google_protobuf_StringValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_mutable_default_value(xds_type_v3_CelExtractString* msg, upb_Arena* arena) { struct google_protobuf_StringValue* sub = (struct google_protobuf_StringValue*)xds_type_v3_CelExtractString_default_value(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c index fcc50fcea3..a4966c4561 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = { &xds_type_v3_CelExpression_submsgs[0], &xds_type_v3_CelExpression__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.CelExpression", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -53,6 +56,9 @@ const upb_MiniTable xds__type__v3__CelExtractString_msg_init = { &xds_type_v3_CelExtractString_submsgs[0], &xds_type_v3_CelExtractString__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.CelExtractString", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb.h index 06415a8d69..55515f71f1 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb.h @@ -88,11 +88,11 @@ UPB_INLINE int64_t xds_type_v3_Int64Range_end(const xds_type_v3_Int64Range* msg) UPB_INLINE void xds_type_v3_Int64Range_set_start(xds_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_Int64Range_set_end(xds_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.v3.Int32Range */ @@ -158,11 +158,11 @@ UPB_INLINE int32_t xds_type_v3_Int32Range_end(const xds_type_v3_Int32Range* msg) UPB_INLINE void xds_type_v3_Int32Range_set_start(xds_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_Int32Range_set_end(xds_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.v3.DoubleRange */ @@ -228,11 +228,11 @@ UPB_INLINE double xds_type_v3_DoubleRange_end(const xds_type_v3_DoubleRange* msg UPB_INLINE void xds_type_v3_DoubleRange_set_start(xds_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c index c9c1db8a67..ea6c37beb7 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__type__v3__Int64Range_msg_init = { NULL, &xds_type_v3_Int64Range__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.Int64Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -38,6 +41,9 @@ const upb_MiniTable xds__type__v3__Int32Range_msg_init = { NULL, &xds_type_v3_Int32Range__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.Int32Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -55,6 +61,9 @@ const upb_MiniTable xds__type__v3__DoubleRange_msg_init = { NULL, &xds_type_v3_DoubleRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.DoubleRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h index ece0269781..067c0051b9 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h @@ -93,11 +93,11 @@ UPB_INLINE bool xds_type_v3_TypedStruct_has_value(const xds_type_v3_TypedStruct* UPB_INLINE void xds_type_v3_TypedStruct_set_type_url(xds_type_v3_TypedStruct *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_TypedStruct_set_value(xds_type_v3_TypedStruct *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value(xds_type_v3_TypedStruct* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)xds_type_v3_TypedStruct_value(msg); diff --git a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c index 5d8123db08..bb9826d214 100644 --- a/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c +++ b/deps/grpc/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable xds__type__v3__TypedStruct_msg_init = { &xds_type_v3_TypedStruct_submsgs[0], &xds_type_v3_TypedStruct__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.TypedStruct", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c index 9e9cd9db90..a6f5a44f71 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c @@ -13,7 +13,7 @@ extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[2736] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 's', 'e', 'r', 'v', 'e', 'r', '_', 'i', +static const char descriptor[2867] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 's', 'e', 'r', 'v', 'e', 'r', '_', 'i', 'n', 'f', 'o', '.', 'p', 'r', 'o', 't', 'o', '\022', '\016', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', @@ -41,88 +41,93 @@ static const char descriptor[2736] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', ' '\020', '\000', '\022', '\014', '\n', '\010', 'D', 'R', 'A', 'I', 'N', 'I', 'N', 'G', '\020', '\001', '\022', '\024', '\n', '\020', 'P', 'R', 'E', '_', 'I', 'N', 'I', 'T', 'I', 'A', 'L', 'I', 'Z', 'I', 'N', 'G', '\020', '\002', '\022', '\020', '\n', '\014', 'I', 'N', 'I', 'T', 'I', 'A', 'L', 'I', 'Z', 'I', 'N', 'G', '\020', '\003', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', -'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', '\"', '\333', '\016', '\n', '\022', +'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', '\"', '\336', '\017', '\n', '\022', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\027', '\n', '\007', 'b', 'a', 's', 'e', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\006', 'b', 'a', 's', 'e', 'I', 'd', '\022', '-', '\n', '\023', 'u', 's', 'e', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'b', 'a', 's', 'e', '_', 'i', 'd', '\030', '\037', ' ', '\001', '(', '\010', 'R', '\020', 'u', -'s', 'e', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'B', 'a', 's', 'e', 'I', 'd', '\022', ' ', '\n', '\014', 'b', 'a', 's', 'e', '_', 'i', -'d', '_', 'p', 'a', 't', 'h', '\030', ' ', ' ', '\001', '(', '\t', 'R', '\n', 'b', 'a', 's', 'e', 'I', 'd', 'P', 'a', 't', 'h', '\022', -' ', '\n', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\r', 'R', '\013', 'c', 'o', 'n', -'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'p', 'a', 't', 'h', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', -'g', '_', 'y', 'a', 'm', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'Y', 'a', 'm', 'l', '\022', -'=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 's', 't', 'a', 't', 'i', 'c', '_', 'f', -'i', 'e', 'l', 'd', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'U', 'n', 'k', 'n', 'o', 'w', 'n', -'S', 't', 'a', 't', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'r', 'e', 'j', 'e', 'c', 't', '_', 'u', 'n', -'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\032', ' ', '\001', '(', -'\010', 'R', '\032', 'r', 'e', 'j', 'e', 'c', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', -'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', -'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\036', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', -'e', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', ',', '\n', '\022', -'a', 'd', 'm', 'i', 'n', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'p', 'a', 't', 'h', '\030', '\006', ' ', '\001', '(', '\t', 'R', -'\020', 'a', 'd', 'm', 'i', 'n', 'A', 'd', 'd', 'r', 'e', 's', 's', 'P', 'a', 't', 'h', '\022', 'e', '\n', '\030', 'l', 'o', 'c', 'a', -'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'i', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', -'\016', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', -'d', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\025', 'l', -'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\033', '\n', '\t', 'l', -'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'g', 'L', 'e', 'v', 'e', 'l', '\022', -'.', '\n', '\023', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\t', ' ', -'\001', '(', '\t', 'R', '\021', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 'L', 'o', 'g', 'L', 'e', 'v', 'e', 'l', '\022', '\035', '\n', -'\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\t', 'l', 'o', 'g', 'F', 'o', 'r', -'m', 'a', 't', '\022', ',', '\n', '\022', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 'e', 's', 'c', 'a', 'p', 'e', 'd', -'\030', '\033', ' ', '\001', '(', '\010', 'R', '\020', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'E', 's', 'c', 'a', 'p', 'e', 'd', '\022', -'\031', '\n', '\010', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\007', 'l', 'o', 'g', 'P', 'a', 't', -'h', '\022', '\'', '\n', '\017', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\r', ' ', '\001', '(', -'\t', 'R', '\016', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', -'i', 'c', 'e', '_', 'n', 'o', 'd', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'o', -'d', 'e', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'z', 'o', 'n', 'e', '\030', '\017', ' ', '\001', '(', '\t', 'R', -'\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'Z', 'o', 'n', 'e', '\022', 'I', '\n', '\023', 'f', 'i', 'l', 'e', '_', 'f', 'l', 'u', 's', -'h', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'f', 'i', 'l', 'e', 'F', -'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '8', '\n', '\n', 'd', 'r', 'a', 'i', 'n', '_', 't', 'i', 'm', -'e', '\030', '\021', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\t', 'd', 'r', 'a', 'i', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\016', 'd', -'r', 'a', 'i', 'n', '_', 's', 't', 'r', 'a', 't', 'e', 'g', 'y', '\030', '!', ' ', '\001', '(', '\016', '2', '0', '.', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', -'t', 'i', 'o', 'n', 's', '.', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', 'R', '\r', 'd', 'r', 'a', 'i', -'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', 'K', '\n', '\024', 'p', 'a', 'r', 'e', 'n', 't', '_', 's', 'h', 'u', 't', 'd', -'o', 'w', 'n', '_', 't', 'i', 'm', 'e', '\030', '\022', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\022', 'p', 'a', 'r', 'e', 'n', 't', 'S', -'h', 'u', 't', 'd', 'o', 'w', 'n', 'T', 'i', 'm', 'e', '\022', ';', '\n', '\004', 'm', 'o', 'd', 'e', '\030', '\023', ' ', '\001', '(', '\016', -'2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', -'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'M', 'o', 'd', 'e', 'R', '\004', 'm', 'o', 'd', 'e', '\022', '.', '\n', -'\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', '\030', '\026', ' ', '\001', '(', -'\010', 'R', '\021', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', '\022', '0', '\n', '\024', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'm', 'u', 't', 'e', 'x', '_', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\030', '\027', ' ', '\001', '(', '\010', -'R', '\022', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'u', 't', 'e', 'x', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '#', '\n', '\r', 'r', -'e', 's', 't', 'a', 'r', 't', '_', 'e', 'p', 'o', 'c', 'h', '\030', '\030', ' ', '\001', '(', '\r', 'R', '\014', 'r', 'e', 's', 't', 'a', -'r', 't', 'E', 'p', 'o', 'c', 'h', '\022', '%', '\n', '\016', 'c', 'p', 'u', 's', 'e', 't', '_', 't', 'h', 'r', 'e', 'a', 'd', 's', -'\030', '\031', ' ', '\001', '(', '\010', 'R', '\r', 'c', 'p', 'u', 's', 'e', 't', 'T', 'h', 'r', 'e', 'a', 'd', 's', '\022', '/', '\n', '\023', -'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\030', '\034', ' ', '\003', '(', '\t', -'R', '\022', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\022', '9', '\n', '\031', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'n', 'e', '_', 'g', 'r', 'a', 'i', 'n', '_', 'l', 'o', 'g', 'g', 'i', 'n', 'g', '\030', -'\"', ' ', '\001', '(', '\010', 'R', '\026', 'e', 'n', 'a', 'b', 'l', 'e', 'F', 'i', 'n', 'e', 'G', 'r', 'a', 'i', 'n', 'L', 'o', 'g', -'g', 'i', 'n', 'g', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'p', 'a', 't', 'h', '\030', '#', ' ', '\001', '(', '\t', -'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'o', -'d', 'e', '\030', '$', ' ', '\001', '(', '\r', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'M', 'o', 'd', 'e', '\022', '(', '\n', '\020', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'c', 'o', 'r', 'e', '_', 'd', 'u', 'm', 'p', '\030', '%', ' ', '\001', '(', '\010', 'R', '\016', 'e', 'n', -'a', 'b', 'l', 'e', 'C', 'o', 'r', 'e', 'D', 'u', 'm', 'p', '\022', '\033', '\n', '\t', 's', 't', 'a', 't', 's', '_', 't', 'a', 'g', -'\030', '&', ' ', '\003', '(', '\t', 'R', '\010', 's', 't', 'a', 't', 's', 'T', 'a', 'g', '\"', '\033', '\n', '\t', 'I', 'p', 'V', 'e', 'r', -'s', 'i', 'o', 'n', '\022', '\006', '\n', '\002', 'v', '4', '\020', '\000', '\022', '\006', '\n', '\002', 'v', '6', '\020', '\001', '\"', '-', '\n', '\004', 'M', -'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'e', 'r', 'v', 'e', '\020', '\000', '\022', '\014', '\n', '\010', 'V', 'a', 'l', 'i', 'd', 'a', 't', -'e', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'n', 'i', 't', 'O', 'n', 'l', 'y', '\020', '\002', '\"', '+', '\n', '\r', 'D', 'r', 'a', 'i', -'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', '\013', '\n', '\007', 'G', 'r', 'a', 'd', 'u', 'a', 'l', '\020', '\000', '\022', '\r', '\n', -'\t', 'I', 'm', 'm', 'e', 'd', 'i', 'a', 't', 'e', '\020', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', -'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\024', '\020', '\025', 'J', '\004', '\010', '\025', -'\020', '\026', 'J', '\004', '\010', '\035', '\020', '\036', 'R', '\t', 'm', 'a', 'x', '_', 's', 't', 'a', 't', 's', 'R', '\020', 'm', 'a', 'x', '_', -'o', 'b', 'j', '_', 'n', 'a', 'm', 'e', '_', 'l', 'e', 'n', 'R', '\021', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '_', 'v', -'e', 'r', 's', 'i', 'o', 'n', 'B', 'x', '\n', '\034', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', 'B', '\017', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', -'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '=', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', -'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', ';', 'a', 'd', 'm', 'i', 'n', 'v', '3', '\272', '\200', '\310', '\321', '\006', -'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'s', 'e', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'B', 'a', 's', 'e', 'I', 'd', '\022', '?', '\n', '\035', 's', 'k', 'i', 'p', '_', 'h', +'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', '_', 'o', 'n', '_', 'n', 'o', '_', 'p', 'a', 'r', 'e', 'n', 't', '\030', '\'', +' ', '\001', '(', '\010', 'R', '\030', 's', 'k', 'i', 'p', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', 'O', 'n', 'N', 'o', 'P', +'a', 'r', 'e', 'n', 't', '\022', '@', '\n', '\035', 's', 'k', 'i', 'p', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', +'_', 'p', 'a', 'r', 'e', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '(', ' ', '\001', '(', '\010', 'R', '\031', 's', 'k', 'i', 'p', +'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', 'P', 'a', 'r', 'e', 'n', 't', 'S', 't', 'a', 't', 's', '\022', ' ', '\n', '\014', +'b', 'a', 's', 'e', '_', 'i', 'd', '_', 'p', 'a', 't', 'h', '\030', ' ', ' ', '\001', '(', '\t', 'R', '\n', 'b', 'a', 's', 'e', 'I', +'d', 'P', 'a', 't', 'h', '\022', ' ', '\n', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\030', '\002', ' ', '\001', '(', +'\r', 'R', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'P', 'a', 't', 'h', '\022', '\037', '\n', +'\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'y', 'a', 'm', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', +'g', 'Y', 'a', 'm', 'l', '\022', '=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 's', 't', +'a', 't', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'U', +'n', 'k', 'n', 'o', 'w', 'n', 'S', 't', 'a', 't', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'r', 'e', 'j', +'e', 'c', 't', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', +'s', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\032', 'r', 'e', 'j', 'e', 'c', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'u', 'n', 'k', 'n', +'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\036', ' ', '\001', '(', '\010', 'R', +'\032', 'i', 'g', 'n', 'o', 'r', 'e', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', +'d', 's', '\022', ',', '\n', '\022', 'a', 'd', 'm', 'i', 'n', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'p', 'a', 't', 'h', '\030', +'\006', ' ', '\001', '(', '\t', 'R', '\020', 'a', 'd', 'm', 'i', 'n', 'A', 'd', 'd', 'r', 'e', 's', 's', 'P', 'a', 't', 'h', '\022', 'e', +'\n', '\030', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'i', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', +'n', '\030', '\007', ' ', '\001', '(', '\016', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', +'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'p', 'V', 'e', 'r', 's', +'i', 'o', 'n', 'R', '\025', 'l', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', +'n', '\022', '\033', '\n', '\t', 'l', 'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'g', +'L', 'e', 'v', 'e', 'l', '\022', '.', '\n', '\023', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'l', 'e', +'v', 'e', 'l', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 'L', 'o', 'g', 'L', 'e', +'v', 'e', 'l', '\022', '\035', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\t', +'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ',', '\n', '\022', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 'e', +'s', 'c', 'a', 'p', 'e', 'd', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\020', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'E', 's', +'c', 'a', 'p', 'e', 'd', '\022', '\031', '\n', '\010', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\007', +'l', 'o', 'g', 'P', 'a', 't', 'h', '\022', '\'', '\n', '\017', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\016', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '!', +'\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'o', 'd', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', +'v', 'i', 'c', 'e', 'N', 'o', 'd', 'e', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'z', 'o', 'n', 'e', '\030', +'\017', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'Z', 'o', 'n', 'e', '\022', 'I', '\n', '\023', 'f', 'i', 'l', +'e', '_', 'f', 'l', 'u', 's', 'h', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', +'\021', 'f', 'i', 'l', 'e', 'F', 'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '8', '\n', '\n', 'd', 'r', 'a', +'i', 'n', '_', 't', 'i', 'm', 'e', '\030', '\021', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\t', 'd', 'r', 'a', 'i', 'n', 'T', 'i', 'm', +'e', '\022', 'W', '\n', '\016', 'd', 'r', 'a', 'i', 'n', '_', 's', 't', 'r', 'a', 't', 'e', 'g', 'y', '\030', '!', ' ', '\001', '(', '\016', +'2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', +'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', +'R', '\r', 'd', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', 'K', '\n', '\024', 'p', 'a', 'r', 'e', 'n', 't', +'_', 's', 'h', 'u', 't', 'd', 'o', 'w', 'n', '_', 't', 'i', 'm', 'e', '\030', '\022', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\022', 'p', +'a', 'r', 'e', 'n', 't', 'S', 'h', 'u', 't', 'd', 'o', 'w', 'n', 'T', 'i', 'm', 'e', '\022', ';', '\n', '\004', 'm', 'o', 'd', 'e', +'\030', '\023', ' ', '\001', '(', '\016', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', +'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'M', 'o', 'd', 'e', 'R', '\004', 'm', +'o', 'd', 'e', '\022', '.', '\n', '\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', +'t', '\030', '\026', ' ', '\001', '(', '\010', 'R', '\021', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', +'t', '\022', '0', '\n', '\024', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'm', 'u', 't', 'e', 'x', '_', 't', 'r', 'a', 'c', 'i', 'n', 'g', +'\030', '\027', ' ', '\001', '(', '\010', 'R', '\022', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'u', 't', 'e', 'x', 'T', 'r', 'a', 'c', 'i', 'n', +'g', '\022', '#', '\n', '\r', 'r', 'e', 's', 't', 'a', 'r', 't', '_', 'e', 'p', 'o', 'c', 'h', '\030', '\030', ' ', '\001', '(', '\r', 'R', +'\014', 'r', 'e', 's', 't', 'a', 'r', 't', 'E', 'p', 'o', 'c', 'h', '\022', '%', '\n', '\016', 'c', 'p', 'u', 's', 'e', 't', '_', 't', +'h', 'r', 'e', 'a', 'd', 's', '\030', '\031', ' ', '\001', '(', '\010', 'R', '\r', 'c', 'p', 'u', 's', 'e', 't', 'T', 'h', 'r', 'e', 'a', +'d', 's', '\022', '/', '\n', '\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'\030', '\034', ' ', '\003', '(', '\t', 'R', '\022', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'s', '\022', '9', '\n', '\031', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'n', 'e', '_', 'g', 'r', 'a', 'i', 'n', '_', 'l', 'o', +'g', 'g', 'i', 'n', 'g', '\030', '\"', ' ', '\001', '(', '\010', 'R', '\026', 'e', 'n', 'a', 'b', 'l', 'e', 'F', 'i', 'n', 'e', 'G', 'r', +'a', 'i', 'n', 'L', 'o', 'g', 'g', 'i', 'n', 'g', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'p', 'a', 't', 'h', +'\030', '#', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'c', +'k', 'e', 't', '_', 'm', 'o', 'd', 'e', '\030', '$', ' ', '\001', '(', '\r', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'M', 'o', 'd', +'e', '\022', '(', '\n', '\020', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'c', 'o', 'r', 'e', '_', 'd', 'u', 'm', 'p', '\030', '%', ' ', '\001', +'(', '\010', 'R', '\016', 'e', 'n', 'a', 'b', 'l', 'e', 'C', 'o', 'r', 'e', 'D', 'u', 'm', 'p', '\022', '\033', '\n', '\t', 's', 't', 'a', +'t', 's', '_', 't', 'a', 'g', '\030', '&', ' ', '\003', '(', '\t', 'R', '\010', 's', 't', 'a', 't', 's', 'T', 'a', 'g', '\"', '\033', '\n', +'\t', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\006', '\n', '\002', 'v', '4', '\020', '\000', '\022', '\006', '\n', '\002', 'v', '6', '\020', +'\001', '\"', '-', '\n', '\004', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'e', 'r', 'v', 'e', '\020', '\000', '\022', '\014', '\n', '\010', 'V', +'a', 'l', 'i', 'd', 'a', 't', 'e', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'n', 'i', 't', 'O', 'n', 'l', 'y', '\020', '\002', '\"', '+', +'\n', '\r', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', '\013', '\n', '\007', 'G', 'r', 'a', 'd', 'u', 'a', +'l', '\020', '\000', '\022', '\r', '\n', '\t', 'I', 'm', 'm', 'e', 'd', 'i', 'a', 't', 'e', '\020', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', +'\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'o', 'm', +'m', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\024', +'\020', '\025', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\035', '\020', '\036', 'R', '\t', 'm', 'a', 'x', '_', 's', 't', 'a', 't', 's', +'R', '\020', 'm', 'a', 'x', '_', 'o', 'b', 'j', '_', 'n', 'a', 'm', 'e', '_', 'l', 'e', 'n', 'R', '\021', 'b', 'o', 'o', 't', 's', +'t', 'r', 'a', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'B', 'x', '\n', '\034', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', 'B', '\017', 'S', 'e', 'r', 'v', +'e', 'r', 'I', 'n', 'f', 'o', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '=', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', ';', 'a', 'd', 'm', 'i', 'n', 'v', +'3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[5] = { @@ -137,5 +142,5 @@ _upb_DefPool_Init envoy_admin_v3_server_info_proto_upbdefinit = { deps, &envoy_admin_v3_server_info_proto_upb_file_layout, "envoy/admin/v3/server_info.proto", - UPB_STRINGVIEW_INIT(descriptor, 2736) + UPB_STRINGVIEW_INIT(descriptor, 2867) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c index 844eec40c7..a129c5f33f 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4747] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', +static const char descriptor[4752] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', @@ -151,64 +151,65 @@ static const char descriptor[4747] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', -'e', 'r', '\"', '\365', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', -'\022', '\242', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\213', '\001', '\372', 'B', '\207', '\001', '\222', '\001', -'\203', '\001', '\"', '\200', '\001', 'r', '~', 'R', '\002', 'L', 'H', 'R', '\002', 'U', 'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', '\002', -'U', 'R', 'R', '\002', 'U', 'F', 'R', '\002', 'U', 'C', 'R', '\002', 'U', 'O', 'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', 'F', -'I', 'R', '\002', 'R', 'L', 'R', '\004', 'U', 'A', 'E', 'X', 'R', '\004', 'R', 'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', 'R', -'X', 'R', '\002', 'S', 'I', 'R', '\002', 'I', 'H', 'R', '\003', 'D', 'P', 'E', 'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', 'F', -'C', 'F', 'R', '\004', 'N', 'F', 'C', 'F', 'R', '\002', 'D', 'T', 'R', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', 'M', -'R', '\002', 'D', 'F', 'R', '\002', 'D', 'O', 'R', '\005', 'f', 'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', -'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', -'\"', '\200', '\004', '\n', '\020', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', ']', '\n', '\010', -'s', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', -'t', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '.', 'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', -'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', -'d', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', '\n', '\006', 'S', 't', 'a', -'t', 'u', 's', '\022', '\006', '\n', '\002', 'O', 'K', '\020', '\000', '\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', 'L', 'E', 'D', '\020', '\001', -'\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', 'A', 'L', 'I', 'D', '_', -'A', 'R', 'G', 'U', 'M', 'E', 'N', 'T', '\020', '\003', '\022', '\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', 'N', 'E', '_', 'E', 'X', -'C', 'E', 'E', 'D', 'E', 'D', '\020', '\004', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\005', '\022', '\022', -'\n', '\016', 'A', 'L', 'R', 'E', 'A', 'D', 'Y', '_', 'E', 'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', '\n', '\021', 'P', 'E', 'R', -'M', 'I', 'S', 'S', 'I', 'O', 'N', '_', 'D', 'E', 'N', 'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', 'R', 'E', 'S', 'O', 'U', -'R', 'C', 'E', '_', 'E', 'X', 'H', 'A', 'U', 'S', 'T', 'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', 'A', 'I', 'L', 'E', 'D', -'_', 'P', 'R', 'E', 'C', 'O', 'N', 'D', 'I', 'T', 'I', 'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', 'B', 'O', 'R', 'T', 'E', -'D', '\020', '\n', '\022', '\020', '\n', '\014', 'O', 'U', 'T', '_', 'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\013', '\022', '\021', '\n', '\r', -'U', 'N', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', 'N', 'T', 'E', 'R', 'N', -'A', 'L', '\020', '\r', '\022', '\017', '\n', '\013', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\016', '\022', '\r', '\n', '\t', -'D', 'A', 'T', 'A', '_', 'L', 'O', 'S', 'S', '\020', '\017', '\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', 'H', 'E', 'N', 'T', 'I', -'C', 'A', 'T', 'E', 'D', '\020', '\020', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'G', -'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', 'M', 'e', 't', 'a', 'd', -'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', '@', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', -'\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', -'.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', -'\022', 'N', '\n', '\026', 'm', 'a', 't', 'c', 'h', '_', 'i', 'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', -'d', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', 'e', 'y', 'N', 'o', 't', -'F', 'o', 'u', 'n', 'd', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'M', 'e', 't', -'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', -'t', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', -'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', -'s', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', -'t', 'y', 'p', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', -'x', 'c', 'l', 'u', 'd', 'e', '\"', '\266', '\001', '\n', '\017', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', -'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', -'t', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', -'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'E', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', -'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\221', '\001', '\n', '\'', 'i', 'o', '.', 'e', -'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', -'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', -'o', 'P', '\001', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', -'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', ';', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'e', 'r', '\"', '\372', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', +'\022', '\247', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\220', '\001', '\372', 'B', '\214', '\001', '\222', '\001', +'\210', '\001', '\"', '\205', '\001', 'r', '\202', '\001', 'R', '\002', 'L', 'H', 'R', '\002', 'U', 'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', +'\002', 'U', 'R', 'R', '\002', 'U', 'F', 'R', '\002', 'U', 'C', 'R', '\002', 'U', 'O', 'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', +'F', 'I', 'R', '\002', 'R', 'L', 'R', '\004', 'U', 'A', 'E', 'X', 'R', '\004', 'R', 'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', +'R', 'X', 'R', '\002', 'S', 'I', 'R', '\002', 'I', 'H', 'R', '\003', 'D', 'P', 'E', 'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', +'F', 'C', 'F', 'R', '\004', 'N', 'F', 'C', 'F', 'R', '\002', 'D', 'T', 'R', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', +'M', 'R', '\002', 'D', 'F', 'R', '\002', 'D', 'O', 'R', '\002', 'D', 'R', 'R', '\005', 'f', 'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', +'\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', +'i', 'l', 't', 'e', 'r', '\"', '\200', '\004', '\n', '\020', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', +'r', '\022', ']', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', +'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '.', 'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', +'\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', +'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', +'\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', '\006', '\n', '\002', 'O', 'K', '\020', '\000', '\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', +'L', 'E', 'D', '\020', '\001', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', +'A', 'L', 'I', 'D', '_', 'A', 'R', 'G', 'U', 'M', 'E', 'N', 'T', '\020', '\003', '\022', '\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', +'N', 'E', '_', 'E', 'X', 'C', 'E', 'E', 'D', 'E', 'D', '\020', '\004', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', +'D', '\020', '\005', '\022', '\022', '\n', '\016', 'A', 'L', 'R', 'E', 'A', 'D', 'Y', '_', 'E', 'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', +'\n', '\021', 'P', 'E', 'R', 'M', 'I', 'S', 'S', 'I', 'O', 'N', '_', 'D', 'E', 'N', 'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', +'R', 'E', 'S', 'O', 'U', 'R', 'C', 'E', '_', 'E', 'X', 'H', 'A', 'U', 'S', 'T', 'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', +'A', 'I', 'L', 'E', 'D', '_', 'P', 'R', 'E', 'C', 'O', 'N', 'D', 'I', 'T', 'I', 'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', +'B', 'O', 'R', 'T', 'E', 'D', '\020', '\n', '\022', '\020', '\n', '\014', 'O', 'U', 'T', '_', 'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', +'\013', '\022', '\021', '\n', '\r', 'U', 'N', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', +'N', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\r', '\022', '\017', '\n', '\013', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', +'\016', '\022', '\r', '\n', '\t', 'D', 'A', 'T', 'A', '_', 'L', 'O', 'S', 'S', '\020', '\017', '\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', +'H', 'E', 'N', 'T', 'I', 'C', 'A', 'T', 'E', 'D', '\020', '\020', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', +'.', 'v', '2', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', +'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', '@', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', +'\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', +'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', +'t', 'c', 'h', 'e', 'r', '\022', 'N', '\n', '\026', 'm', 'a', 't', 'c', 'h', '_', 'i', 'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', +'_', 'f', 'o', 'u', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', +'e', 'y', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', +'2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', +'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', +'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', +'\002', '\020', '\001', 'R', '\005', 't', 'y', 'p', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', +'(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\266', '\001', '\n', '\017', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'F', 'i', 'l', 't', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', +'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', +'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', +'2', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', +'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\221', '\001', '\n', +'\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', +'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', +'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', +'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', ';', +'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', +'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -229,5 +230,5 @@ _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = { deps, &envoy_config_accesslog_v3_accesslog_proto_upb_file_layout, "envoy/config/accesslog/v3/accesslog.proto", - UPB_STRINGVIEW_INIT(descriptor, 4747) + UPB_STRINGVIEW_INIT(descriptor, 4752) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c index 06d6abbaf7..0d6b80ec6e 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c @@ -33,7 +33,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', +static const char descriptor[9581] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', 'v', '3', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', @@ -71,7 +71,7 @@ static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', -'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\254', '#', '\n', '\t', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', +'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\231', '$', '\n', '\t', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', '\022', '.', '\n', '\023', 'n', 'o', 'd', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\032', ' ', '\003', @@ -197,215 +197,226 @@ static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'G', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\034', 'g', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', -'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\232', '\002', '\n', '\017', 'S', 't', -'a', 't', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '@', '\n', '\t', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', -'s', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'R', '\t', 'l', 'i', 's', 't', 'e', -'n', 'e', 'r', 's', '\022', '<', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', ' ', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', -'l', 'u', 's', 't', 'e', 'r', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'K', '\n', '\007', 's', 'e', 'c', 'r', 'e', -'t', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', -'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', -'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\007', 's', 'e', 'c', 'r', 'e', 't', 's', ':', ':', '\232', '\305', '\210', '\036', '5', -'\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', -'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', -'c', 'e', 's', '\032', '\211', '\003', '\n', '\020', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', -'A', '\n', '\n', 'l', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', -'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', '\n', '\025', 'l', 'd', 's', '_', 'r', -'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\023', 'l', -'d', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'A', '\n', '\n', 'c', 'd', 's', -'_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', -'\t', 'c', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', '\n', '\025', 'c', 'd', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', -'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'c', 'd', 's', 'R', 'e', 's', 'o', -'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'D', '\n', '\n', 'a', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', -'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'a', 'd', -'s', 'C', 'o', 'n', 'f', 'i', 'g', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', -'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'J', '\004', '\010', '\004', '\020', '\005', '\032', -'\371', '\001', '\n', '\024', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', -'b', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', -'o', 't', 's', 't', 'r', 'a', 'p', '.', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', -'f', 'i', 'g', '.', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\t', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\032', -'}', '\n', '\t', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ':', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', -'a', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'H', '\000', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '!', '\n', -'\013', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\n', 't', 'e', 'x', -'t', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\021', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', -'\001', '\032', 'Z', '\n', '\023', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'S', 't', 'a', 't', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', -'C', '\n', '\036', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', 'c', 'r', 'e', 'a', 't', 'i', -'o', 'n', '_', 's', 't', 'a', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\033', 'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', -'e', 'r', 'r', 'e', 'd', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 's', '\032', '\211', '\001', '\n', '\034', 'G', 'r', -'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', -'g', '\022', 'i', '\n', '\036', 'm', 'a', 'x', '_', 'c', 'a', 'c', 'h', 'e', 'd', '_', 'e', 'n', 't', 'r', 'y', '_', 'i', 'd', 'l', -'e', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', -'\004', '2', '\002', '\010', '\005', 'R', '\032', 'm', 'a', 'x', 'C', 'a', 'c', 'h', 'e', 'd', 'E', 'n', 't', 'r', 'y', 'I', 'd', 'l', 'e', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\032', '{', '\n', '!', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', -'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', -'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '@', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', -'\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\005', 'v', -'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', -'a', 'p', 'B', '\r', '\n', '\013', 's', 't', 'a', 't', 's', '_', 'f', 'l', 'u', 's', 'h', 'J', '\004', '\010', '\n', '\020', '\013', 'J', '\004', -'\010', '\013', '\020', '\014', 'R', '\007', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\211', '\003', '\n', '\005', 'A', 'd', 'm', 'i', 'n', '\022', 'C', -'\n', '\n', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', -'e', 's', 's', 'L', 'o', 'g', 'R', '\t', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', '3', '\n', '\017', 'a', 'c', 'c', 'e', -'s', 's', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', 'R', '\r', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', '!', '\n', '\014', 'p', -'r', 'o', 'f', 'i', 'l', 'e', '_', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 'p', 'r', 'o', 'f', 'i', 'l', -'e', 'P', 'a', 't', 'h', '\022', '7', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', -'e', 's', 's', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', 'I', '\n', '\016', 's', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', -'t', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\r', 's', -'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\030', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', -'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\025', 'i', 'g', -'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', 't', ':', '&', '\232', '\305', '\210', '\036', -'!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', -'.', 'v', '2', '.', 'A', 'd', 'm', 'i', 'n', '\"', '\224', '\005', '\n', '\016', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', -'g', 'e', 'r', '\022', ',', '\n', '\022', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'R', '\020', 'l', 'o', 'c', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', -'g', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', -'\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', -'p', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', -'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', -'t', 'i', 'o', 'n', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', -'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\022', 'u', 'p', 's', 't', 'r', -'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Q', '\n', '\021', 'l', 'o', 'a', 'd', '_', 's', 't', 'a', -'t', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', -'u', 'r', 'c', 'e', 'R', '\017', 'l', 'o', 'a', 'd', 'S', 't', 'a', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', ' ', -'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', -'r', 'e', 'a', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\035', 'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', -'r', 'r', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', '\032', '\311', '\001', '\n', '\020', 'O', -'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', '$', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', -'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', -'a', 't', 'h', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\002', ' ', '\001', '(', -'\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', -'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', -'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '@', '\232', '\305', '\210', '\036', ';', '\n', '9', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'k', '\n', '\030', 'm', 'e', 'm', +'o', 'r', 'y', '_', 'a', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', ')', ' ', '\001', +'(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', +'a', 'p', '.', 'v', '3', '.', 'M', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', +'g', 'e', 'r', 'R', '\026', 'm', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', 'g', +'e', 'r', '\032', '\232', '\002', '\n', '\017', 'S', 't', 'a', 't', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '@', '\n', +'\t', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', +'e', 'r', 'R', '\t', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', '<', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', +'\030', '\002', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', +'s', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', +'\022', 'K', '\n', '\007', 's', 'e', 'c', 'r', 'e', 't', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', +'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\007', 's', 'e', 'c', 'r', 'e', +'t', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', +'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'S', 't', 'a', +'t', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\032', '\211', '\003', '\n', '\020', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', +'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', 'A', '\n', '\n', 'l', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', +'\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', '2', '\n', '\025', 'l', 'd', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', +'\030', '\005', ' ', '\001', '(', '\t', 'R', '\023', 'l', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', +'o', 'r', '\022', 'A', '\n', '\n', 'c', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', +'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'c', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', '\n', '\025', 'c', 'd', +'s', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\006', ' ', '\001', '(', '\t', +'R', '\023', 'c', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'D', '\n', '\n', +'a', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', +'o', 'u', 'r', 'c', 'e', 'R', '\t', 'a', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', +'.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', +'e', 's', 'J', '\004', '\010', '\004', '\020', '\005', '\032', '\371', '\001', '\n', '\024', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', +'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'b', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', +'\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', +'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', +'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\t', 'l', +'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\032', '}', '\n', '\t', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ':', '\n', '\013', +'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'H', '\000', 'R', '\n', 'j', 's', 'o', 'n', +'F', 'o', 'r', 'm', 'a', 't', '\022', '!', '\n', '\013', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\n', 't', 'e', 'x', 't', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\021', '\n', '\n', 'l', 'o', 'g', '_', 'f', +'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', '\032', 'Z', '\n', '\023', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'S', 't', 'a', +'t', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'C', '\n', '\036', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', +'e', 'd', '_', 'c', 'r', 'e', 'a', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\033', +'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', +'t', 's', '\032', '\211', '\001', '\n', '\034', 'G', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', +'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'i', '\n', '\036', 'm', 'a', 'x', '_', 'c', 'a', 'c', 'h', 'e', 'd', '_', +'e', 'n', 't', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', +'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', +'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '2', '\002', '\010', '\005', 'R', '\032', 'm', 'a', 'x', 'C', 'a', 'c', 'h', 'e', 'd', +'E', 'n', 't', 'r', 'y', 'I', 'd', 'l', 'e', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\032', '{', '\n', '!', 'C', 'e', 'r', 't', +'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', 'E', +'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '@', '\n', +'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'C', 'o', 'n', 'f', 'i', 'g', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', +'#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', +'2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'B', '\r', '\n', '\013', 's', 't', 'a', 't', 's', '_', 'f', 'l', 'u', 's', +'h', 'J', '\004', '\010', '\n', '\020', '\013', 'J', '\004', '\010', '\013', '\020', '\014', 'R', '\007', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\211', '\003', +'\n', '\005', 'A', 'd', 'm', 'i', 'n', '\022', 'C', '\n', '\n', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '\030', '\005', ' ', '\003', +'(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', +'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'R', '\t', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', +'g', '\022', '3', '\n', '\017', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', +'\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\r', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', +'P', 'a', 't', 'h', '\022', '!', '\n', '\014', 'p', 'r', 'o', 'f', 'i', 'l', 'e', '_', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', +'\t', 'R', '\013', 'p', 'r', 'o', 'f', 'i', 'l', 'e', 'P', 'a', 't', 'h', '\022', '7', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', +'\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', 'I', '\n', '\016', +'s', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'o', 'c', 'k', 'e', 't', +'O', 'p', 't', 'i', 'o', 'n', 'R', '\r', 's', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\030', +'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', 'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', +'\006', ' ', '\001', '(', '\010', 'R', '\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', +'m', 'i', 't', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'A', 'd', 'm', 'i', 'n', '\"', '\224', '\005', '\n', '\016', 'C', 'l', +'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', ',', '\n', '\022', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'l', 'u', +'s', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\020', 'l', 'o', 'c', 'a', 'l', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'g', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', +'t', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', +'g', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', +'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', +'_', 'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', +'i', 'g', 'R', '\022', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Q', '\n', +'\021', 'l', 'o', 'a', 'd', '_', 's', 't', 'a', 't', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', +'%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', +'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\017', 'l', 'o', 'a', 'd', 'S', 't', 'a', 't', 's', 'C', +'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', ' ', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', +'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'r', 'e', 'a', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\035', 'e', +'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'r', 'e', 'a', 't', +'i', 'o', 'n', '\032', '\311', '\001', '\n', '\020', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', +'$', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\014', +'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', +'v', 'i', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', 'f', +'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '@', '\232', '\305', '\210', '\036', ';', '\n', '9', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', +'.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', +'t', 'e', 'c', 't', 'i', 'o', 'n', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', -'a', 'n', 'a', 'g', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', ':', '/', -'\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', -'t', 'r', 'a', 'p', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\260', '\001', -'\n', '\t', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 's', '\022', 'U', '\n', '\024', 'm', 'a', 'i', 'n', '_', 't', 'h', 'r', 'e', 'a', -'d', '_', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', -'d', 'o', 'g', 'R', '\022', 'm', 'a', 'i', 'n', 'T', 'h', 'r', 'e', 'a', 'd', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'L', -'\n', '\017', 'w', 'o', 'r', 'k', 'e', 'r', '_', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', +'a', 'n', 'a', 'g', 'e', 'r', '\"', '\260', '\001', '\n', '\t', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 's', '\022', 'U', '\n', '\024', 'm', +'a', 'i', 'n', '_', 't', 'h', 'r', 'e', 'a', 'd', '_', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\030', '\001', ' ', '\001', '(', '\013', +'2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', +'.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'R', '\022', 'm', 'a', 'i', 'n', 'T', 'h', 'r', 'e', 'a', 'd', 'W', +'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'L', '\n', '\017', 'w', 'o', 'r', 'k', 'e', 'r', '_', 'w', 'a', 't', 'c', 'h', 'd', 'o', +'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', +'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'R', '\016', 'w', 'o', 'r', 'k', +'e', 'r', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\"', '\272', '\006', '\n', '\010', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'L', +'\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', +'o', 'g', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', +'s', '\022', '<', '\n', '\014', 'm', 'i', 's', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'R', '\013', 'm', 'i', 's', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'D', '\n', '\020', 'm', 'e', 'g', 'a', 'm', 'i', 's', 's', +'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 'm', 'e', 'g', 'a', 'm', 'i', 's', +'s', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', +'\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', +'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'k', 'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'Z', '\n', '\027', 'm', +'a', 'x', '_', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\006', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '2', '\000', 'R', '\024', 'm', 'a', 'x', 'K', 'i', 'l', 'l', 'T', +'i', 'm', 'e', 'o', 'u', 't', 'J', 'i', 't', 't', 'e', 'r', '\022', 'F', '\n', '\021', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', +'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'm', 'u', 'l', 't', 'i', 'k', 'i', +'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'G', '\n', '\023', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', '_', 't', 'h', +'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\022', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', 'T', 'h', +'r', 'e', 's', 'h', 'o', 'l', 'd', '\032', '\205', '\002', '\n', '\016', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', +'n', '\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '`', '\n', '\005', 'e', 'v', +'e', 'n', 't', '\030', '\002', ' ', '\001', '(', '\016', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '.', 'W', 'a', 't', +'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', 't', +'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', 'e', 'v', 'e', 'n', 't', '\"', 'M', '\n', '\r', 'W', 'a', 't', 'c', +'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', 't', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', +'\004', 'K', 'I', 'L', 'L', '\020', '\001', '\022', '\r', '\n', '\t', 'M', 'U', 'L', 'T', 'I', 'K', 'I', 'L', 'L', '\020', '\002', '\022', '\014', '\n', +'\010', 'M', 'E', 'G', 'A', 'M', 'I', 'S', 'S', '\020', '\003', '\022', '\010', '\n', '\004', 'M', 'I', 'S', 'S', '\020', '\004', ':', ')', '\232', '\305', +'\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', +'a', 'p', '.', 'v', '2', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\"', 'Q', '\n', '\013', 'F', 'a', 't', 'a', 'l', 'A', 'c', +'t', 'i', 'o', 'n', '\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\334', '\001', +'\n', '\007', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '!', '\n', '\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', 'r', 'o', 'o', 't', +'\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'y', 'm', 'l', 'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', '\n', '\014', 's', 'u', +'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', +'c', 't', 'o', 'r', 'y', '\022', '3', '\n', '\025', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'u', 'b', 'd', 'i', 'r', 'e', +'c', 't', 'o', 'r', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 'u', 'b', 'd', +'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '+', '\n', '\004', 'b', 'a', 's', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\027', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\004', 'b', +'a', 's', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\333', '\006', '\n', '\014', +'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '<', '\n', '\014', 's', 't', 'a', 't', 'i', +'c', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'H', '\000', 'R', '\013', 's', 't', 'a', 't', 'i', 'c', 'L', 'a', +'y', 'e', 'r', '\022', 'R', '\n', '\n', 'd', 'i', 's', 'k', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', -'3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'R', '\016', 'w', 'o', 'r', 'k', 'e', 'r', 'W', 'a', 't', 'c', 'h', 'd', 'o', -'g', '\"', '\272', '\006', '\n', '\010', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'L', '\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', -'\030', '\007', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', -'t', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '.', 'W', 'a', 't', 'c', 'h', 'd', -'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\014', 'm', 'i', 's', 's', -'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'm', 'i', 's', 's', 'T', 'i', 'm', -'e', 'o', 'u', 't', '\022', 'D', '\n', '\020', 'm', 'e', 'g', 'a', 'm', 'i', 's', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', -'\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', -'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 'm', 'e', 'g', 'a', 'm', 'i', 's', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', -'<', '\n', '\014', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', -'k', 'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'Z', '\n', '\027', 'm', 'a', 'x', '_', 'k', 'i', 'l', 'l', '_', 't', -'i', 'm', 'e', 'o', 'u', 't', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', -'\005', '\252', '\001', '\002', '2', '\000', 'R', '\024', 'm', 'a', 'x', 'K', 'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'J', 'i', 't', -'t', 'e', 'r', '\022', 'F', '\n', '\021', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', -'\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', -'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', -'\022', 'G', '\n', '\023', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', -' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', -'e', 'n', 't', 'R', '\022', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\032', '\205', -'\002', '\n', '\016', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', '\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', -'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', -'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '`', '\n', '\005', 'e', 'v', 'e', 'n', 't', '\030', '\002', ' ', '\001', '(', '\016', -'2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', -'.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', -'o', 'n', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', -'\001', 'R', '\005', 'e', 'v', 'e', 'n', 't', '\"', 'M', '\n', '\r', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', 't', -'\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'K', 'I', 'L', 'L', '\020', '\001', '\022', '\r', -'\n', '\t', 'M', 'U', 'L', 'T', 'I', 'K', 'I', 'L', 'L', '\020', '\002', '\022', '\014', '\n', '\010', 'M', 'E', 'G', 'A', 'M', 'I', 'S', 'S', -'\020', '\003', '\022', '\010', '\n', '\004', 'M', 'I', 'S', 'S', '\020', '\004', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'W', 'a', 't', -'c', 'h', 'd', 'o', 'g', '\"', 'Q', '\n', '\013', 'F', 'a', 't', 'a', 'l', 'A', 'c', 't', 'i', 'o', 'n', '\022', 'B', '\n', '\006', 'c', -'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', -'o', 'n', 'f', 'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\334', '\001', '\n', '\007', 'R', 'u', 'n', 't', 'i', 'm', 'e', -'\022', '!', '\n', '\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', 'r', 'o', 'o', 't', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', -'y', 'm', 'l', 'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', '\n', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', -'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '3', '\n', '\025', -'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\003', ' ', '\001', -'(', '\t', 'R', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', -'+', '\n', '\004', 'b', 'a', 's', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\004', 'b', 'a', 's', 'e', ':', '(', '\232', '\305', '\210', '\036', -'#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', -'.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\333', '\006', '\n', '\014', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', -'y', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', -'\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '<', '\n', '\014', 's', 't', 'a', 't', 'i', 'c', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\002', -' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', -'r', 'u', 'c', 't', 'H', '\000', 'R', '\013', 's', 't', 'a', 't', 'i', 'c', 'L', 'a', 'y', 'e', 'r', '\022', 'R', '\n', '\n', 'd', 'i', -'s', 'k', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', -'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\t', 'd', 'i', 's', 'k', 'L', 'a', -'y', 'e', 'r', '\022', 'U', '\n', '\013', 'a', 'd', 'm', 'i', 'n', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', -'2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', -'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', -'r', 'H', '\000', 'R', '\n', 'a', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', '\022', 'R', '\n', '\n', 'r', 't', 'd', 's', '_', 'l', -'a', 'y', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', -'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\t', 'r', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', '\032', -'\301', '\001', '\n', '\t', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\022', '!', '\n', '\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', -'r', 'o', 'o', 't', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'y', 'm', 'l', 'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', -'\n', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', -'d', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '4', '\n', '\026', 'a', 'p', 'p', 'e', 'n', 'd', '_', 's', 'e', 'r', 'v', 'i', -'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'S', -'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', -'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\032', 'F', '\n', '\n', 'A', -'d', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', -'e', 'L', 'a', 'y', 'e', 'r', '.', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', '\032', '\235', '\001', '\n', '\t', 'R', 't', 'd', -'s', 'L', 'a', 'y', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', -'e', '\022', 'C', '\n', '\013', 'r', 't', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', -'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'r', 't', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', -'\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', -'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', -'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', -'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'B', -'\026', '\n', '\017', 'l', 'a', 'y', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\202', -'\001', '\n', '\016', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '?', '\n', '\006', 'l', 'a', 'y', 'e', -'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', -'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'R', -'\006', 'l', 'a', 'y', 'e', 'r', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', -'u', 'n', 't', 'i', 'm', 'e', '\"', '\261', '\002', '\n', '\022', 'C', 'u', 's', 't', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', -'a', 'd', 'e', 'r', '\022', ';', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', -'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\020', 'i', -'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'v', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', -'_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'C', 'u', 's', -'t', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '.', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', -'d', 'e', 'r', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\020', 'i', 'n', 'l', 'i', 'n', 'e', -'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\"', 'f', '\n', '\020', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', -'r', 'T', 'y', 'p', 'e', '\022', '\022', '\n', '\016', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\000', -'\022', '\023', '\n', '\017', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\001', '\022', '\023', '\n', '\017', -'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\002', '\022', '\024', '\n', '\020', 'R', 'E', 'S', 'P', -'O', 'N', 'S', 'E', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\003', 'B', '\221', '\001', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', -'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', -'s', 't', 'r', 'a', 'p', '.', 'v', '3', 'B', '\016', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'P', 'r', 'o', 't', 'o', 'P', -'\001', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', -'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', -'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', 'v', '3', ';', 'b', 'o', 'o', 't', 's', 't', 'r', -'a', 'p', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', 'H', +'\000', 'R', '\t', 'd', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\022', 'U', '\n', '\013', 'a', 'd', 'm', 'i', 'n', '_', 'l', 'a', 'y', +'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', +'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', +'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\n', 'a', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', '\022', +'R', '\n', '\n', 'r', 't', 'd', 's', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', +'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\t', 'r', +'t', 'd', 's', 'L', 'a', 'y', 'e', 'r', '\032', '\301', '\001', '\n', '\t', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\022', '!', '\n', +'\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', 'r', 'o', 'o', 't', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'y', 'm', 'l', +'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', '\n', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\003', +' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '4', '\n', '\026', 'a', 'p', 'p', +'e', 'n', 'd', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\010', +'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '7', '\232', +'\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', +'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', 'L', +'a', 'y', 'e', 'r', '\032', 'F', '\n', '\n', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', ':', '8', '\232', '\305', '\210', '\036', '3', +'\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', +'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', +'r', '\032', '\235', '\001', '\n', '\t', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', +' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'C', '\n', '\013', 'r', 't', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', +'\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'r', 't', 'd', 's', 'C', 'o', +'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', +'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', +'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'B', '\026', '\n', '\017', 'l', 'a', 'y', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', +'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\202', '\001', '\n', '\016', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', +'e', '\022', '?', '\n', '\006', 'l', 'a', 'y', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', +'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'R', '\006', 'l', 'a', 'y', 'e', 'r', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', +'.', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\261', '\002', '\n', '\022', 'C', 'u', 's', 't', 'o', +'m', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '\022', ';', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', +'\300', '\001', '\001', '\310', '\001', '\000', 'R', '\020', 'i', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', +'v', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', +'(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', +'a', 'p', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '.', +'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', +'\001', 'R', '\020', 'i', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\"', 'f', '\n', '\020', 'I', 'n', +'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '\022', '\n', '\016', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', +'_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\000', '\022', '\023', '\n', '\017', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'T', 'R', 'A', 'I', +'L', 'E', 'R', '\020', '\001', '\022', '\023', '\n', '\017', 'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', +'\002', '\022', '\024', '\n', '\020', 'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\003', '\"', '\225', +'\001', '\n', '\026', 'M', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', +'\022', '(', '\n', '\020', 'b', 'y', 't', 'e', 's', '_', 't', 'o', '_', 'r', 'e', 'l', 'e', 'a', 's', 'e', '\030', '\001', ' ', '\001', '(', +'\004', 'R', '\016', 'b', 'y', 't', 'e', 's', 'T', 'o', 'R', 'e', 'l', 'e', 'a', 's', 'e', '\022', 'Q', '\n', '\027', 'm', 'e', 'm', 'o', +'r', 'y', '_', 'r', 'e', 'l', 'e', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', +'o', 'n', 'R', '\025', 'm', 'e', 'm', 'o', 'r', 'y', 'R', 'e', 'l', 'e', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'B', '\221', '\001', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', 'B', '\016', 'B', 'o', 'o', 't', +'s', 't', 'r', 'a', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', +'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', +'/', 'v', '3', ';', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', +'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[25] = { @@ -440,5 +451,5 @@ _upb_DefPool_Init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit = { deps, &envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout, "envoy/config/bootstrap/v3/bootstrap.proto", - UPB_STRINGVIEW_INIT(descriptor, 9320) + UPB_STRINGVIEW_INIT(descriptor, 9581) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h index 0d54bf0f88..3f79363928 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h @@ -128,6 +128,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_CustomInlineHeader_ge return upb_DefPool_FindMessageByName(s, "envoy.config.bootstrap.v3.CustomInlineHeader"); } +UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_MemoryAllocatorManager_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.bootstrap.v3.MemoryAllocatorManager"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c index fe64938bb3..7fa62797ac 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c @@ -33,7 +33,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[12560] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', +static const char descriptor[13073] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', @@ -72,7 +72,7 @@ static const char descriptor[12560] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 'K', '\n', '\021', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', -'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\227', +'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\326', 'S', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'o', '\n', '\030', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 's', '\030', '+', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', @@ -241,301 +241,321 @@ static const char descriptor[12560] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'A', '\n', '\n', 'l', 'r', 's', '_', 's', 'e', 'r', 'v', 'e', 'r', '\030', '*', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', -'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '?', '\n', '\025', 't', 'r', 'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', -'_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', -'.', '0', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', 'S', -'\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '0', ' ', '\001', '(', '\013', '2', '*', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', -'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 's', 't', 'r', 'e', -'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\023', 't', 'r', 'a', 'c', 'k', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', -'_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', -'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', -'\022', '^', '\n', '\021', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '2', ' ', '\001', -'(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', -'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', -'i', 'c', 'y', 'R', '\020', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', -'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'o', 'o', 'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', -'t', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'o', 'o', 'l', 'P', 'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', -'m', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\032', '\346', '\001', '\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', -'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', -'\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', -'t', 'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', -'_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', -'e', 't', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', -'+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', -'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', -'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', -'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', -'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', -'i', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', -'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', -'\246', '\001', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', -'d', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', -'e', 'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', -'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', ':', ',', '\232', -'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\244', '\n', '\n', '\016', 'L', 'b', -'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'y', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', -'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', '(', '\016', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', -'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', -'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', -'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '>', '\n', '\016', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'u', 'b', -'s', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'S', 'u', 'b', 's', 'e', 't', '\022', -'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', -'2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', +'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '=', '\n', '\033', 'l', 'r', 's', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', '_', 'm', 'e', 't', 'r', 'i', 'c', 's', '\030', '9', ' ', '\003', '(', '\t', 'R', '\030', 'l', 'r', 's', +'R', 'e', 'p', 'o', 'r', 't', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'M', 'e', 't', 'r', 'i', 'c', 's', '\022', '?', '\n', '\025', +'t', 'r', 'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', '\001', +'(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', 'i', 'm', +'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', 'S', '\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '0', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', +'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\023', +'t', 'r', 'a', 'c', 'k', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', '(', '\013', +'2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', +'3', '.', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', 'a', 'c', +'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '^', '\n', '\021', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', +'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '2', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', +'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\020', 'p', 'r', 'e', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', +'o', 'o', 'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', +'t', 'i', 'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'o', 'o', +'l', 'P', 'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\032', +'\346', '\001', '\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\022', +'\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', +'a', 'm', 'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', 'c', 'h', +'\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', '\001', '(', +'\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', +'t', 'S', 'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', +'e', 't', 'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', +'T', 'y', 'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', +'\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', +'\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', +'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', +'m', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', '\246', '\001', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', +'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', +'\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 's', +'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', +'C', 'o', 'n', 'f', 'i', 'g', '\032', '\244', '\n', '\n', '\016', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', 'y', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', '(', '\016', +'2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', -'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'R', '\017', 's', 'u', 'b', 's', 'e', 't', 'S', -'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', '\n', '\025', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', -'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', -'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', '\022', '2', '\n', '\025', 's', 'c', 'a', 'l', 'e', '_', 'l', 'o', 'c', 'a', 'l', -'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\023', 's', 'c', 'a', 'l', 'e', 'L', 'o', -'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', 'm', 'o', 'd', -'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\014', 'p', 'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', 'A', 'n', 'y', -'\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', 's', '_', 'a', 'n', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\t', 'l', 'i', -'s', 't', 'A', 's', 'A', 'n', 'y', '\022', '\222', '\001', '\n', '\030', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', -'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', '\001', '(', '\016', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', -'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', -'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', -'P', 'o', 'l', 'i', 'c', 'y', '\032', '\332', '\003', '\n', '\020', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', -'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\004', 'k', 'e', 'y', 's', '\022', '3', '\n', -'\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', 'o', 's', 't', '_', 'p', 'e', 'r', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\004', -' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', 'g', 'l', 'e', 'H', 'o', 's', 't', 'P', 'e', 'r', 'S', 'u', 'b', 's', 'e', 't', -'\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', -'\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', -'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', -'.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', -'t', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', -'\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', -'0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'k', 'e', 'y', 's', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\003', -' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'K', 'e', 'y', 's', 'S', 'u', 'b', 's', 'e', 't', '\"', -'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', -'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', 'T', '_', 'D', 'E', 'F', 'I', 'N', 'E', 'D', '\020', '\000', -'\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\001', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', -'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\002', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', -'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', 'K', 'E', 'Y', 'S', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\004', ':', ';', '\232', -'\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', -'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', 'O', '\n', '\026', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', -'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', -'\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'E', -'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\002', '\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', -'t', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', -'\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', -'\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', 'L', 'I', 'S', 'T', '\020', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', -'\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', -'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\343', '\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', -'t', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', -'d', 'o', 'w', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', -'d', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', -'t', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', -'\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\003', ' ', '\001', '(', '\013', -'2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', -'\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', -'d', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', -'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', -'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\n', '\024', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', -'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', 'c', 'h', 'o', 'i', 'c', 'e', '_', 'c', 'o', 'u', 'n', 't', '\030', -'\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', -'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\002', 'R', '\013', 'c', 'h', 'o', 'i', -'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', '\n', '\023', 'a', 'c', 't', 'i', 'v', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', -'_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\021', -'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 'i', 'a', 's', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', -'_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', -'t', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', -'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', -'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\221', '\003', '\n', '\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', -'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', -'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', -'\004', 'R', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', -'h', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', -'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', -'t', 'i', 'o', 'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', -'\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', -'m', 'a', 'x', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 'e', '\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', -'n', 'c', 't', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', '_', 'H', 'A', 'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', -'R', 'M', 'U', 'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', '\001', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', -'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\002', '\020', '\003', '\032', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', -'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', '\n', 't', 'a', 'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', -'\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', -'t', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', -'l', 'e', 'S', 'i', 'z', 'e', '\032', '\277', '\002', '\n', '\023', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', -'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', -'\001', ' ', '\001', '(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '(', '\n', '\020', 'h', -'t', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', -'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', ']', '\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', -'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', -'\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', -'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'F', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\004', -' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', 'K', 'e', 'y', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', -'f', 'i', 'g', '\032', '\325', '\013', '\n', '\016', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', -'\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 'n', 'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', -'\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', -'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', -'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 'a', 'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', -'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', -'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', -'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', -'\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', -'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', -'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', -'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', -'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', -'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'I', '\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', -'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', -'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', -'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', '_', 'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', -'\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 'w', 'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', -'s', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', -'_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 't', '_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', -'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', -'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', '\n', '\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', -'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', -'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', -'s', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', -'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', -'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', -' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', -'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 'u', 's', '\032', '\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', -'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '?', '\n', '\017', 'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', -'b', 'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', -'3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'o', 'u', 't', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', -'\022', 'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', -'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', -'4', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', -'\025', 'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', -'\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', -'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', -'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '_', '\n', '\030', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', -'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', -'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', -'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', '\031', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', -'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '7', '\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', -'a', 'm', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', -'e', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 'r', 'H', 'a', 's', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', -'s', 'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'f', 'a', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', -'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 'd', 'R', '\021', 'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', -'F', 'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', '\036', '?', '\n', '=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', -'.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', -'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', -'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', -'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', -'\322', '\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', -'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', -'*', '\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', -'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', -'\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', -'\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\032', '\203', '\002', '\n', '\020', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', -'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'x', '\n', '\035', 'p', 'e', 'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', -'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', -'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', -'\360', '?', 'R', '\032', 'p', 'e', 'r', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'R', 'a', 't', 'i', 'o', '\022', 'u', '\n', '\033', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'c', 'o', -'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', -'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\031', 'p', -'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\032', -'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', -'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', -'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', -'\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', -'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', 'S', 'T', 'R', 'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', -'\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', -'\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', -'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', 'U', 'N', 'D', '_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', -'\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', -'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', 'A', 'N', 'D', 'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', -'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', 'U', 'S', 'T', 'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', -'\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', 'B', 'A', 'L', 'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', -'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', '\"', '\004', '\010', '\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', -'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', 'P', '\n', '\017', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', -'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', -'\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', -'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 'A', 'L', 'L', '\020', '\004', '\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', -'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', -'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 'D', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', -'\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 'T', 'R', 'E', 'A', 'M', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', -'\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', -'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', -'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', -'\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', '\020', '\010', 'J', '\004', '\010', '\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', -'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 's', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\332', -'\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', -'\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', -'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', -'i', 'e', 's', '\032', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', -'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', -'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', -'\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'R', '\004', 'n', 'a', 'm', 'e', 'R', '\014', 't', 'y', 'p', 'e', 'd', '_', -'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\371', '\001', -'\n', '\031', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', -'n', 's', '\022', 'G', '\n', '\r', 't', 'c', 'p', '_', 'k', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', -'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', -'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'R', '\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', -'\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 'a', 'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', -'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', -'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 'e', 't', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', -'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', -'n', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', -'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', -'\240', '\001', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', -'t', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', -'m', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', '4', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', -'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', 'e', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', -'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'S', 'i', 'z', 'e', 's', '\022', ',', '\n', '\022', 'p', 'e', 'r', '_', 'e', -'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'e', 'r', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', 'B', '\211', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', -'r', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', 'g', 'i', 't', -'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', -'t', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', -'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', ';', 'c', 'l', 'u', 's', 't', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', -'\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', +'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '>', +'\n', '\016', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\r', 'd', +'e', 'f', 'a', 'u', 'l', 't', 'S', 'u', 'b', 's', 'e', 't', '\022', 'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', 's', 'e', +'l', 'e', 'c', 't', 'o', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', +'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', +'c', 't', 'o', 'r', 'R', '\017', 's', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', '\n', '\025', +'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', ' ', '\001', +'(', '\010', 'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', '\022', '2', +'\n', '\025', 's', 'c', 'a', 'l', 'e', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\005', +' ', '\001', '(', '\010', 'R', '\023', 's', 'c', 'a', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', +'\022', '$', '\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', 'm', 'o', 'd', 'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', +'\014', 'p', 'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', 'A', 'n', 'y', '\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', 's', '_', +'a', 'n', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\t', 'l', 'i', 's', 't', 'A', 's', 'A', 'n', 'y', '\022', '\222', '\001', '\n', '\030', +'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +'\010', ' ', '\001', '(', '\016', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', +'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', +'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', +'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\032', '\332', '\003', '\n', '\020', 'L', +'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', +' ', '\003', '(', '\t', 'R', '\004', 'k', 'e', 'y', 's', '\022', '3', '\n', '\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', 'o', 's', 't', +'_', 'p', 'e', 'r', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', 'g', 'l', 'e', +'H', 'o', 's', 't', 'P', 'e', 'r', 'S', 'u', 'b', 's', 'e', 't', '\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', +'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', +'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', +'e', 'c', 't', 'o', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', +'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', +'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', +'k', 'e', 'y', 's', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', 'l', 'b', 'a', +'c', 'k', 'K', 'e', 'y', 's', 'S', 'u', 'b', 's', 'e', 't', '\"', 'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', +'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', +'N', 'O', 'T', '_', 'D', 'E', 'F', 'I', 'N', 'E', 'D', '\020', '\000', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', +'A', 'C', 'K', '\020', '\001', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\002', '\022', '\022', +'\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', 'K', 'E', 'Y', +'S', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\004', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', +'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', 'O', '\n', '\026', +'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', +'\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', +'P', 'O', 'I', 'N', 'T', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', +'\020', '\002', '\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', +'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', '\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', +'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', +'L', 'I', 'S', 'T', '\020', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', +'\032', '\343', '\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', +'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', +'\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', +'s', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\n', +'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', '\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', +'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', +'r', 'c', 'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', +' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', +'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', +'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\n', +'\024', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', +'c', 'h', 'o', 'i', 'c', 'e', '_', 'c', 'o', 'u', 'n', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', +'\372', 'B', '\004', '*', '\002', '(', '\002', 'R', '\013', 'c', 'h', 'o', 'i', 'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', '\n', '\023', 'a', +'c', 't', 'i', 'v', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', +'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', +'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\021', 'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', 'u', 'e', 's', +'t', 'B', 'i', 'a', 's', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', +'t', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', +'0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', +'t', 'e', 'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', +'\221', '\003', '\n', '\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', +'i', 'n', 'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', +'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', +'n', 'g', 'S', 'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', 'h', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', +' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', +'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', +'o', 'n', 'f', 'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', +'\002', '\020', '\001', 'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', +'m', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', +'\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', +'i', 'z', 'e', '\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', +'_', 'H', 'A', 'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', 'R', 'M', 'U', 'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', +'\001', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', +'\002', '\020', '\003', '\032', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', '\n', +'t', 'a', 'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', +'\007', '2', '\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\032', '\277', '\002', '\n', '\023', 'O', +'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', +'_', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', +'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '(', '\n', '\020', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', +'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', +'\022', ']', '\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', +'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', +'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'F', '\n', '\014', 'm', +'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', +'.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', +'a', 'K', 'e', 'y', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', +'(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', +'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\325', '\013', '\n', '\016', 'C', 'o', 'm', 'm', +'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', '\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 'n', +'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', +'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 'h', +'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 'a', +'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', +'s', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', +'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', +'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', +'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', +'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 'l', +'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'I', +'\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', 'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', 'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', +'\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', 'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', '_', +'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 'w', +'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', 's', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 's', +'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 't', +'_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', 'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', '\n', +'\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 'o', +'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', +'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', +'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', +'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', +'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', +'t', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 'u', +'s', '\032', '\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '?', +'\n', '\017', 'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', +'o', 'u', 't', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 's', +'t', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 'C', +'l', 'u', 's', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', '\025', 'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 'i', +'c', '_', 'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 'a', +'f', 'f', 'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', +'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '_', +'\n', '\030', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', +'g', ':', 'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', +'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', '\031', +'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', '7', '\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 'h', +'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', 'e', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 'r', +'H', 'a', 's', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', 's', 'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'f', +'a', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 'd', +'R', '\021', 'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'F', 'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', '\036', +'?', '\n', '=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', +'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', +'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', +'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', +'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', '\322', '\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', +'a', 't', 'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', +'\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', +'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '*', '\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 'e', +'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', +'\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', +'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 'a', +'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', +'\032', '\203', '\002', '\n', '\020', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'x', '\n', '\035', +'p', 'e', 'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', +'a', 't', 'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', +'\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\032', 'p', 'e', 'r', 'U', 'p', 's', 't', 'r', +'e', 'a', 'm', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\022', 'u', '\n', '\033', 'p', 'r', 'e', +'d', 'i', 'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', '\030', +'\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', +'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\010', +'@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\031', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', 'P', 'r', 'e', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\032', 'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', +'\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', +'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', 'o', +'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', 'S', +'T', 'R', 'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', '\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', 'N', +'S', '\020', '\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', '\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', +'D', 'S', 'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', 'U', +'N', 'D', '_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', '\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', 'E', +'S', 'T', '\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', 'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', 'A', +'N', 'D', 'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', 'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', 'U', +'S', 'T', 'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', '\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', 'B', +'A', 'L', 'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', 'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', '\"', +'\004', '\010', '\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', 'P', '\n', +'\017', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', +'\000', '\022', '\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', 'Y', +'\020', '\002', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', 'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 'A', +'L', 'L', '\020', '\004', '\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', +'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 'D', +'_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 'T', +'R', 'E', 'A', 'M', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 'l', +'u', 's', 't', 'e', 'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 'l', +'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', '\020', +'\010', 'J', '\004', '\010', '\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', 'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 's', +'_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', +'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\332', '\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', +'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', ' ', +'\003', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', +'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', +'P', 'o', 'l', 'i', 'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\032', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 'i', +'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'c', 'o', 'n', +'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', +':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', +'d', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', +'\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'R', +'\004', 'n', 'a', 'm', 'e', 'R', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', '\036', +'\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', +'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\273', '\005', '\n', '\031', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'G', '\n', '\r', 't', 'c', 'p', '_', 'k', 'e', +'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'R', +'\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 'a', +'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 'r', +'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 'e', +'t', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 't', +'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '\025', 'h', 'a', 'p', 'p', 'y', '_', +'e', 'y', 'e', 'b', 'a', 'l', 'l', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'F', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'U', 'p', +'s', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', +'a', 'p', 'p', 'y', 'E', 'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'h', 'a', 'p', 'p', 'y', +'E', 'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\211', '\002', '\n', '\023', 'H', 'a', 'p', 'p', 'y', 'E', +'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\215', '\001', '\n', '\034', 'f', 'i', 'r', 's', 't', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '_', 'f', 'a', 'm', 'i', 'l', 'y', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', +'(', '\016', '2', 'L', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', +'.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', +'i', 'o', 'n', 's', '.', 'F', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', 'l', 'y', 'V', 'e', +'r', 's', 'i', 'o', 'n', 'R', '\031', 'f', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', 'l', 'y', +'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', 'b', '\n', '\032', 'f', 'i', 'r', 's', 't', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', +'f', 'a', 'm', 'i', 'l', 'y', '_', 'c', 'o', 'u', 'n', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', +'\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\027', 'f', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', +'l', 'y', 'C', 'o', 'u', 'n', 't', '\"', '8', '\n', '\031', 'F', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', +'m', 'i', 'l', 'y', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', +'\006', '\n', '\002', 'V', '4', '\020', '\001', '\022', '\006', '\n', '\002', 'V', '6', '\020', '\002', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\240', '\001', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', +'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', +'\022', '4', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', 'e', +'s', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'S', +'i', 'z', 'e', 's', '\022', ',', '\n', '\022', 'p', 'e', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', +'s', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'e', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', +'B', '\211', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', 'e', +'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', +'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', +'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', ';', 'c', 'l', +'u', 's', 't', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[25] = { @@ -570,5 +590,5 @@ _upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit = { deps, &envoy_config_cluster_v3_cluster_proto_upb_file_layout, "envoy/config/cluster/v3/cluster.proto", - UPB_STRINGVIEW_INIT(descriptor, 12560) + UPB_STRINGVIEW_INIT(descriptor, 13073) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h index 33f27333e6..fc2d1a9899 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h @@ -133,6 +133,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptio return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions"); } +UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig"); +} + UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.TrackClusterStats"); diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c index b2ba276046..d651d3d7ab 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c @@ -9,123 +9,132 @@ #include "envoy/config/cluster/v3/outlier_detection.upbdefs.h" #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2703] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', +static const char descriptor[2892] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', -'\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', -'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', -'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', -'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', -'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', -'r', 'o', 't', 'o', '\"', '\212', '\022', '\n', '\020', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', -'\022', 'E', '\n', '\017', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', '\030', '\001', ' ', '\001', '(', '\013', -'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', -'V', 'a', 'l', 'u', 'e', 'R', '\016', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '5', 'x', 'x', '\022', '?', '\n', '\010', -'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', -'\000', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'Q', '\n', '\022', 'b', 'a', 's', 'e', '_', 'e', 'j', 'e', 'c', 't', -'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', -'\000', 'R', '\020', 'b', 'a', 's', 'e', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\024', 'm', 'a', -'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', +'$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', +'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', +'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', +'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', +'/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', +'t', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\241', '\023', '\n', '\020', 'O', 'u', 't', +'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'E', '\n', '\017', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', +'i', 'v', 'e', '_', '5', 'x', 'x', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'c', 'o', 'n', 's', 'e', +'c', 'u', 't', 'i', 'v', 'e', '5', 'x', 'x', '\022', '?', '\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', +'Q', '\n', '\022', 'b', 'a', 's', 'e', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\030', '\003', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\020', 'b', 'a', 's', 'e', 'E', 'j', 'e', 'c', 't', +'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\024', 'm', 'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', +'e', 'r', 'c', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', +'d', 'R', '\022', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'a', '\n', '\031', +'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', +'\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\027', 'e', 'n', 'f', +'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '5', 'x', 'x', '\022', '[', '\n', '\026', 'e', +'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '\030', '\006', ' ', '\001', +'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\024', 'e', 'n', 'f', 'o', 'r', 'c', 'i', +'n', 'g', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', '\022', 'Y', '\n', '\032', 's', 'u', 'c', 'c', 'e', 's', 's', '_', +'r', 'a', 't', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'h', 'o', 's', 't', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', -'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\022', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', -'n', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'a', '\n', '\031', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', -'s', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', -'\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\027', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', -'t', 'i', 'v', 'e', '5', 'x', 'x', '\022', '[', '\n', '\026', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 's', 'u', 'c', 'c', -'e', 's', 's', '_', 'r', 'a', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '\030', 'd', 'R', '\024', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', -'\022', 'Y', '\n', '\032', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', -'h', 'o', 's', 't', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\027', 's', 'u', 'c', 'c', 'e', 's', 's', -'R', 'a', 't', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', '[', '\n', '\033', 's', 'u', 'c', 'c', 'e', -'s', 's', '_', 'r', 'a', 't', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\030', '\010', ' ', -'\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', -'t', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\030', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'R', 'e', 'q', 'u', -'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'W', '\n', '\031', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', -'_', 's', 't', 'd', 'e', 'v', '_', 'f', 'a', 'c', 't', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', -'\026', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'S', 't', 'd', 'e', 'v', 'F', 'a', 'c', 't', 'o', 'r', '\022', '\\', -'\n', '\033', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', -'l', 'u', 'r', 'e', '\030', '\n', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\031', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', -'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'x', '\n', '%', 'e', 'n', 'f', 'o', -'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', -'_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '\030', 'd', 'R', '\"', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', -'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'J', '\n', '\"', 's', 'p', 'l', 'i', 't', '_', 'e', -'x', 't', 'e', 'r', 'n', 'a', 'l', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'e', 'r', 'r', 'o', -'r', 's', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\036', 's', 'p', 'l', 'i', 't', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'o', -'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'E', 'r', 'r', 'o', 'r', 's', '\022', 'e', '\n', ' ', 'c', 'o', 'n', 's', 'e', 'c', -'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', -'e', '\030', '\r', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\035', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', -'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '\201', '\001', '\n', '*', 'e', 'n', -'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', -'_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', -'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '&', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', -'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', -'\022', 's', '\n', '#', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', -'n', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '\030', '\017', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', -'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', -'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\037', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'L', 'o', 'c', 'a', 'l', -'O', 'r', 'i', 'g', 'i', 'n', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', '\022', 'g', '\n', '\034', 'f', 'a', 'i', 'l', -'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', -'\020', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', -'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\032', 'f', 'a', 'i', 'l', -'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'g', '\n', -'\034', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', -'t', 'a', 'g', 'e', '\030', '\021', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', -'\032', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', -'g', 'e', '\022', '\177', '\n', ')', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', -'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '\030', '\022', ' ', -'\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', -'t', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '%', 'e', 'n', 'f', 'o', 'r', 'c', -'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'L', 'o', 'c', 'a', 'l', -'O', 'r', 'i', 'g', 'i', 'n', '\022', 'e', '\n', ' ', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', -'a', 'g', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'h', 'o', 's', 't', 's', '\030', '\023', ' ', '\001', '(', '\013', '2', '\034', +'a', 'l', 'u', 'e', 'R', '\027', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', +'o', 's', 't', 's', '\022', '[', '\n', '\033', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 'r', 'e', 'q', 'u', +'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\030', 's', 'u', +'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'W', '\n', +'\031', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 's', 't', 'd', 'e', 'v', '_', 'f', 'a', 'c', 't', 'o', +'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\026', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', +'S', 't', 'd', 'e', 'v', 'F', 'a', 'c', 't', 'o', 'r', '\022', '\\', '\n', '\033', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', +'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\n', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', -'l', 'u', 'e', 'R', '\035', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'M', 'i', 'n', -'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', 'g', '\n', '!', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', -'e', 'n', 't', 'a', 'g', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\030', '\024', ' ', '\001', +'l', 'u', 'e', 'R', '\031', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', +'i', 'l', 'u', 'r', 'e', '\022', 'x', '\n', '%', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', +'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', -'3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\036', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', -'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'O', '\n', '\021', 'm', 'a', 'x', '_', 'e', 'j', 'e', -'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\030', '\025', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', -'\002', '*', '\000', 'R', '\017', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'R', '\n', '\030', 'm', -'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\026', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\"', 'e', 'n', 'f', 'o', 'r', 'c', 'i', +'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', +'r', 'e', '\022', 'J', '\n', '\"', 's', 'p', 'l', 'i', 't', '_', 'e', 'x', 't', 'e', 'r', 'n', 'a', 'l', '_', 'l', 'o', 'c', 'a', +'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'e', 'r', 'r', 'o', 'r', 's', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\036', 's', 'p', +'l', 'i', 't', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'E', 'r', 'r', +'o', 'r', 's', '\022', 'e', '\n', ' ', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', +'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\r', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', +'R', '\035', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', +'a', 'i', 'l', 'u', 'r', 'e', '\022', '\201', '\001', '\n', '*', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', +'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', +'u', 'r', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '&', +'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', +'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 's', '\n', '#', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', +'g', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', +'t', 'e', '\030', '\017', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\037', 'e', +'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'S', 'u', 'c', 'c', 'e', 's', +'s', 'R', 'a', 't', 'e', '\022', 'g', '\n', '\034', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', +'g', 'e', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\020', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', +'\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\032', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', +'e', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'g', '\n', '\034', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', +'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\021', ' ', '\001', '(', '\013', '2', '\034', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', +'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\032', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', +'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\022', '\177', '\n', ')', 'e', 'n', 'f', 'o', 'r', 'c', +'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'l', 'o', +'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '\030', '\022', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', +'\004', '*', '\002', '\030', 'd', 'R', '%', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', +'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', '\022', 'e', '\n', ' ', 'f', 'a', +'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', +'h', 'o', 's', 't', 's', '\030', '\023', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\035', 'f', 'a', 'i', 'l', 'u', 'r', 'e', +'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', 'g', '\n', +'!', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'r', 'e', 'q', 'u', 'e', +'s', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\030', '\024', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\036', 'f', 'a', 'i', +'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', +'m', 'e', '\022', 'O', '\n', '\021', 'm', 'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\030', '\025', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', -'r', 'a', 't', 'i', 'o', 'n', 'R', '\025', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'J', 'i', -'t', 't', 'e', 'r', '\022', 'w', '\n', '+', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', -'_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'u', 'n', 'e', 'j', 'e', 'c', 't', '_', 'h', 'o', 's', -'t', '\030', '\027', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '&', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'A', 'c', 't', -'i', 'v', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'U', 'n', 'e', 'j', 'e', 'c', 't', 'H', 'o', 's', 't', -':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'l', 'u', -'s', 't', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'B', '\222', '\001', '\n', -'%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\025', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', -'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', -'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', -'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', -'v', '3', ';', 'c', 'l', 'u', 's', 't', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\017', 'm', 'a', 'x', 'E', 'j', 'e', 'c', +'t', 'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'R', '\n', '\030', 'm', 'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', +'t', 'i', 'm', 'e', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\026', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\025', 'm', 'a', 'x', 'E', +'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'J', 'i', 't', 't', 'e', 'r', '\022', 'w', '\n', '+', 's', 'u', 'c', 'c', +'e', 's', 's', 'f', 'u', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', +'k', '_', 'u', 'n', 'e', 'j', 'e', 'c', 't', '_', 'h', 'o', 's', 't', '\030', '\027', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '&', +'s', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'A', 'c', 't', 'i', 'v', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', 'U', 'n', 'e', 'j', 'e', 'c', 't', 'H', 'o', 's', 't', '\022', 'F', '\n', '\010', 'm', 'o', 'n', 'i', 't', 'o', 'r', 's', +'\030', '\030', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', +'R', '\010', 'm', 'o', 'n', 'i', 't', 'o', 'r', 's', '\022', 'M', '\n', '\025', 'a', 'l', 'w', 'a', 'y', 's', '_', 'e', 'j', 'e', 'c', +'t', '_', 'o', 'n', 'e', '_', 'h', 'o', 's', 't', '\030', '\031', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\022', 'a', 'l', 'w', 'a', +'y', 's', 'E', 'j', 'e', 'c', 't', 'O', 'n', 'e', 'H', 'o', 's', 't', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', +'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'B', '\222', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', +'v', '3', 'B', '\025', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', +'P', '\001', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', +'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', ';', 'c', 'l', 'u', 's', 't', 'e', 'r', 'v', +'3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[6] = { +static _upb_DefPool_Init *deps[7] = { + &envoy_config_core_v3_extension_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, @@ -138,5 +147,5 @@ _upb_DefPool_Init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit = { deps, &envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout, "envoy/config/cluster/v3/outlier_detection.proto", - UPB_STRINGVIEW_INIT(descriptor, 2703) + UPB_STRINGVIEW_INIT(descriptor, 2892) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c index 3c9eaceba3..c493343e4c 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c @@ -23,7 +23,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[5559] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', +static const char descriptor[6697] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', @@ -98,154 +98,199 @@ static const char descriptor[5559] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 's', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '\035', '\232', '\305', '\210', '\036', '\030', '\n', '\026', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'N', 'o', 'd', 'e', 'B', '\031', '\n', '\027', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\005', '\020', -'\006', 'R', '\r', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\"', '\261', '\003', '\n', '\010', 'M', 'e', 't', 'a', -'d', 'a', 't', 'a', '\022', '[', '\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', +'\006', 'R', '\r', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\"', '\315', '\003', '\n', '\010', 'M', 'e', 't', 'a', +'d', 'a', 't', 'a', '\022', 'i', '\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', -'a', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'k', '\n', -'\025', 't', 'y', 'p', 'e', 'd', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\002', ' ', -'\003', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', -'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'R', '\023', 't', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', -'t', 'a', 'd', 'a', 't', 'a', '\032', 'Z', '\n', '\023', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', -'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '-', '\n', -'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', '\\', -'\n', '\030', 'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', -'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', -'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', -'\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\022', '#', '\n', '\r', 'd', -'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\r', 'R', '\014', 'd', 'e', 'f', 'a', 'u', -'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\003', ' ', -'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', -'&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', -'.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\"', 'w', '\n', '\016', 'R', 'u', 'n', 't', 'i', 'm', 'e', -'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', ';', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', -'\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', -'c', 'e', 'n', 't', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', +'a', 'E', 'n', 't', 'r', 'y', 'B', '\014', '\372', 'B', '\t', '\232', '\001', '\006', '\"', '\004', 'r', '\002', '\020', '\001', 'R', '\016', 'f', 'i', 'l', +'t', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'y', '\n', '\025', 't', 'y', 'p', 'e', 'd', '_', 'f', 'i', 'l', 't', +'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\002', ' ', '\003', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', +'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'B', +'\014', '\372', 'B', '\t', '\232', '\001', '\006', '\"', '\004', 'r', '\002', '\020', '\001', 'R', '\023', 't', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', +'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'Z', '\n', '\023', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', +'t', 'a', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', +'\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', +'\001', '\032', '\\', '\n', '\030', 'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', +'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', +'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '!', '\232', '\305', '\210', +'\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'M', 'e', 't', +'a', 'd', 'a', 't', 'a', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\022', '#', +'\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\r', 'R', '\014', 'd', 'e', +'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', +'\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', +'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', +'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\"', 'w', '\n', '\016', 'R', 'u', 'n', 't', +'i', 'm', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', ';', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', +'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', +'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', +'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', +'D', 'o', 'u', 'b', 'l', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', +' ', '\001', '(', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', -'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', -'b', 'l', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', -'\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', -'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', -'t', 'i', 'm', 'e', 'K', 'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', '\"', '\266', '\001', -'\n', '\022', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\022', 'I', '\n', '\r', 'd', -'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', -'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', -'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', -'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'e', 'a', 't', -'u', 'r', 'e', 'F', 'l', 'a', 'g', '\"', 'A', '\n', '\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', -'\022', '\031', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', -'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', -'\315', '\001', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', -'\001', '(', '\t', 'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\003', 'k', -'e', 'y', '\022', '7', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '!', '\372', 'B', '\014', 'r', '\n', '(', -'\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', -'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', ':', '\n', '\t', 'r', 'a', 'w', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', -'\001', '(', '\014', 'B', '\035', '\372', 'B', '\010', 'z', '\006', '\020', '\000', '\030', '\200', '\200', '\001', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', -'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', '\010', 'r', 'a', 'w', 'V', 'a', 'l', 'u', 'e', ':', '$', '\232', '\305', '\210', '\036', -'\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', -'e', 'r', 'V', 'a', 'l', 'u', 'e', '\"', '\331', '\003', '\n', '\021', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', -'t', 'i', 'o', 'n', '\022', 'C', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', -'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', -'\n', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', 'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\022', 'i', '\n', '\r', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'a', -'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', -'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', -'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'a', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'k', -'e', 'e', 'p', '_', 'e', 'm', 'p', 't', 'y', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\016', 'k', 'e', -'e', 'p', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', 'u', 'e', '\"', '}', '\n', '\022', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', -'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', -'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', 'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', -'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', '\n', '\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', -'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', -'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '\020', '\003', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', -'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'l', '\n', '\t', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\022', ';', '\n', '\007', -'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'R', '\007', -'h', 'e', 'a', 'd', 'e', 'r', 's', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\"', '/', '\n', '\020', 'W', 'a', 't', -'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '\033', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\"', '\364', '\001', '\n', '\n', 'D', 'a', 't', -'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '%', '\n', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\022', '#', '\n', '\014', -'i', 'n', 'l', 'i', 'n', 'e', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\013', 'i', 'n', 'l', -'i', 'n', 'e', 'B', 'y', 't', 'e', 's', '\022', '%', '\n', '\r', 'i', 'n', 'l', 'i', 'n', 'e', '_', 's', 't', 'r', 'i', 'n', 'g', -'\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\014', 'i', 'n', 'l', 'i', 'n', 'e', 'S', 't', 'r', 'i', 'n', 'g', '\022', '<', '\n', -'\024', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', 't', '_', 'v', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\030', '\004', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\023', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', -'t', 'V', 'a', 'r', 'i', 'a', 'b', 'l', 'e', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', +'\"', '\266', '\001', '\n', '\022', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\022', 'I', +'\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', +'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', +'\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', +'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\"', '?', '\n', '\010', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', +'\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\020', '\001', '(', '\200', '\200', '\001', 'R', '\003', +'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\014', 'R', '\005', 'v', 'a', 'l', 'u', 'e', +'\"', '\256', '\002', '\n', '\016', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', '\022', '>', '\n', '\005', 'e', 'n', +'t', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', +'\001', 'R', '\005', 'e', 'n', 't', 'r', 'y', '\022', '[', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', +'9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', +'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', +'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'a', 'c', 't', 'i', 'o', +'n', '\"', '\177', '\n', '\024', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', +'\022', '\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', +'D', 'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', +'\n', '\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', +'A', 'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', +'S', 'T', 'S', '\020', '\003', '\"', 's', '\n', '\020', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'M', 'u', 't', 'a', 't', 'i', 'o', 'n', +'\022', '<', '\n', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', +'p', 'e', 'n', 'd', 'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\022', '!', '\n', '\006', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\002', ' ', +'\001', '(', '\t', 'B', '\t', '\372', 'B', '\006', 'r', '\004', '(', '\200', '\200', '\001', 'R', '\006', 'r', 'e', 'm', 'o', 'v', 'e', '\"', 'A', '\n', +'\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '\031', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', +'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', +'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '\315', '\001', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', +'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\021', '\372', 'B', '\016', 'r', '\014', +'\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\003', 'k', 'e', 'y', '\022', '7', '\n', '\005', 'v', 'a', 'l', 'u', +'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '!', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', '\362', +'\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', +':', '\n', '\t', 'r', 'a', 'w', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\014', 'B', '\035', '\372', 'B', '\010', 'z', '\006', +'\020', '\000', '\030', '\200', '\200', '\001', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', +'\010', 'r', 'a', 'w', 'V', 'a', 'l', 'u', 'e', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\"', '\331', '\003', +'\n', '\021', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'C', '\n', '\006', 'h', 'e', +'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\002', +' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', +'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\006', 'a', 'p', 'p', +'e', 'n', 'd', '\022', 'i', '\n', '\r', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', +'\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', +'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'a', 'p', +'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'k', 'e', 'e', 'p', '_', 'e', 'm', 'p', 't', 'y', '_', +'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\016', 'k', 'e', 'e', 'p', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', +'u', 'e', '\"', '}', '\n', '\022', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', +'\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', +'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', '\n', +'\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', +'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', +'T', 'S', '\020', '\003', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'l', +'\n', '\t', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\022', ';', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', +'\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', ':', '\"', '\232', +'\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', +'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\"', '/', '\n', '\020', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', +'o', 'r', 'y', '\022', '\033', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\004', 'p', 'a', 't', 'h', '\"', '\311', '\002', '\n', '\n', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '%', '\n', +'\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', +'\000', 'R', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\022', '#', '\n', '\014', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'b', 'y', 't', +'e', 's', '\030', '\002', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\013', 'i', 'n', 'l', 'i', 'n', 'e', 'B', 'y', 't', 'e', 's', '\022', '%', +'\n', '\r', 'i', 'n', 'l', 'i', 'n', 'e', '_', 's', 't', 'r', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\014', +'i', 'n', 'l', 'i', 'n', 'e', 'S', 't', 'r', 'i', 'n', 'g', '\022', '<', '\n', '\024', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', +'n', 't', '_', 'v', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'H', '\000', 'R', '\023', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', 't', 'V', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\022', +'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\005', ' ', '\001', '(', +'\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', +'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\020', '\n', '\t', -'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\324', '\001', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', +'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\356', '\005', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'K', '\n', '\016', 'r', 'e', 't', 'r', 'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\001', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'a', 'c', 'k', 'o', 'f', 'f', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', 'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'R', '\n', '\013', 'n', 'u', 'm', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', '\005', '\r', '\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', -'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', -'l', 'i', 'c', 'y', '\"', '\350', '\001', '\n', '\020', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', -'\022', 'B', '\n', '\010', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'U', 'r', 'i', 'B', -'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'h', 't', 't', 'p', 'U', 'r', 'i', '\022', '\037', '\n', '\006', 's', 'h', 'a', -'2', '5', '6', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\006', 's', 'h', 'a', '2', '5', -'6', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 't', -'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', ':', ')', '\232', '\305', -'\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'e', -'m', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\"', '\311', '\001', '\n', '\017', 'A', 's', 'y', 'n', 'c', 'D', -'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '8', '\n', '\005', 'l', 'o', 'c', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', -' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', -'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\005', 'l', 'o', 'c', 'a', 'l', '\022', '@', '\n', '\006', 'r', 'e', 'm', 'o', -'t', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', -'R', '\006', 'r', 'e', 'm', 'o', 't', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 's', 'y', 'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', -'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\260', '\001', '\n', '\017', 'T', 'r', -'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', -'d', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', -'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', -'r', 'e', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'B', '\r', '\n', '\013', 'c', 'o', 'n', -'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\277', '\001', -'\n', '\030', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', -'t', '\022', 'O', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', -' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', -'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', -'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', -'\001', '(', '\t', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', -'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\"', 'U', '\n', '\014', 'C', 'o', 'n', 't', 'r', -'o', 'l', 'P', 'l', 'a', 'n', 'e', '\022', '\036', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\030', '\001', ' ', '\001', -'(', '\t', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', -'a', 'n', 'e', '*', '(', '\n', '\017', 'R', 'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\013', '\n', -'\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\010', '\n', '\004', 'H', 'I', 'G', 'H', '\020', '\001', '*', '\211', '\001', '\n', '\r', -'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\022', 'M', 'E', 'T', 'H', 'O', 'D', '_', 'U', -'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\007', '\n', '\003', 'G', 'E', 'T', '\020', '\001', '\022', '\010', '\n', '\004', -'H', 'E', 'A', 'D', '\020', '\002', '\022', '\010', '\n', '\004', 'P', 'O', 'S', 'T', '\020', '\003', '\022', '\007', '\n', '\003', 'P', 'U', 'T', '\020', '\004', -'\022', '\n', '\n', '\006', 'D', 'E', 'L', 'E', 'T', 'E', '\020', '\005', '\022', '\013', '\n', '\007', 'C', 'O', 'N', 'N', 'E', 'C', 'T', '\020', '\006', -'\022', '\013', '\n', '\007', 'O', 'P', 'T', 'I', 'O', 'N', 'S', '\020', '\007', '\022', '\t', '\n', '\005', 'T', 'R', 'A', 'C', 'E', '\020', '\010', '\022', -'\t', '\n', '\005', 'P', 'A', 'T', 'C', 'H', '\020', '\t', '*', '>', '\n', '\020', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', -'c', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\013', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\013', '\n', -'\007', 'I', 'N', 'B', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'O', 'U', 'T', 'B', 'O', 'U', 'N', 'D', '\020', '\002', 'B', -'}', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\t', 'B', 'a', 's', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', -'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', -'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', -'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', -'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', +'_', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', 'r', 'y', 'O', 'n', '\022', 'V', '\n', '\016', 'r', 'e', 't', +'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'R', '\r', 'r', 'e', 't', 'r', 'y', 'P', 'r', +'i', 'o', 'r', 'i', 't', 'y', '\022', 'f', '\n', '\024', 'r', 'e', 't', 'r', 'y', '_', 'h', 'o', 's', 't', '_', 'p', 'r', 'e', 'd', +'i', 'c', 'a', 't', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', +'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\022', 'r', 'e', 't', 'r', 'y', 'H', 'o', 's', +'t', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'H', '\n', '!', 'h', 'o', 's', 't', '_', 's', 'e', 'l', 'e', 'c', 't', +'i', 'o', 'n', '_', 'r', 'e', 't', 'r', 'y', '_', 'm', 'a', 'x', '_', 'a', 't', 't', 'e', 'm', 'p', 't', 's', '\030', '\006', ' ', +'\001', '(', '\003', 'R', '\035', 'h', 'o', 's', 't', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', 'e', 't', 'r', 'y', 'M', 'a', +'x', 'A', 't', 't', 'e', 'm', 'p', 't', 's', '\032', 'v', '\n', '\r', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', +'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', +'\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'t', 'y', 'p', 'e', '\032', '{', '\n', '\022', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', +'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', +'\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'t', 'y', 'p', 'e', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\350', '\001', '\n', '\020', 'R', 'e', 'm', +'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', 'B', '\n', '\010', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', +'\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'U', 'r', 'i', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'h', +'t', 't', 'p', 'U', 'r', 'i', '\022', '\037', '\n', '\006', 's', 'h', 'a', '2', '5', '6', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'R', '\006', 's', 'h', 'a', '2', '5', '6', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', +'o', 'l', 'i', 'c', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', +'t', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', +'c', 'e', '\"', '\311', '\001', '\n', '\017', 'A', 's', 'y', 'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '8', '\n', +'\005', 'l', 'o', 'c', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\005', +'l', 'o', 'c', 'a', 'l', '\022', '@', '\n', '\006', 'r', 'e', 'm', 'o', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'm', 'o', 't', +'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\006', 'r', 'e', 'm', 'o', 't', 'e', ':', '(', '\232', '\305', +'\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 's', +'y', 'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', +'r', '\022', '\003', '\370', 'B', '\001', '\"', '\260', '\001', '\n', '\017', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', +'t', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', +'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', +'\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', +'S', 'o', 'c', 'k', 'e', 't', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', +'\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\277', '\001', '\n', '\030', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', +'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'O', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', +'_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'r', +'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', +'K', 'e', 'y', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', +'c', 'e', 'n', 't', '\"', 'U', '\n', '\014', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '\022', '\036', '\n', '\n', 'i', +'d', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', +'e', 'r', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', +'o', 'r', 'e', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '*', '(', '\n', '\017', 'R', 'o', 'u', 't', 'i', +'n', 'g', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\010', +'\n', '\004', 'H', 'I', 'G', 'H', '\020', '\001', '*', '\211', '\001', '\n', '\r', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', +'d', '\022', '\026', '\n', '\022', 'M', 'E', 'T', 'H', 'O', 'D', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', +'\022', '\007', '\n', '\003', 'G', 'E', 'T', '\020', '\001', '\022', '\010', '\n', '\004', 'H', 'E', 'A', 'D', '\020', '\002', '\022', '\010', '\n', '\004', 'P', 'O', +'S', 'T', '\020', '\003', '\022', '\007', '\n', '\003', 'P', 'U', 'T', '\020', '\004', '\022', '\n', '\n', '\006', 'D', 'E', 'L', 'E', 'T', 'E', '\020', '\005', +'\022', '\013', '\n', '\007', 'C', 'O', 'N', 'N', 'E', 'C', 'T', '\020', '\006', '\022', '\013', '\n', '\007', 'O', 'P', 'T', 'I', 'O', 'N', 'S', '\020', +'\007', '\022', '\t', '\n', '\005', 'T', 'R', 'A', 'C', 'E', '\020', '\010', '\022', '\t', '\n', '\005', 'P', 'A', 'T', 'C', 'H', '\020', '\t', '*', '>', +'\n', '\020', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\013', 'U', 'N', 'S', +'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\013', '\n', '\007', 'I', 'N', 'B', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\014', +'\n', '\010', 'O', 'U', 'T', 'B', 'O', 'U', 'N', 'D', '\020', '\002', 'B', '}', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'B', '\t', 'B', 'a', 's', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', +'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[15] = { @@ -270,5 +315,5 @@ _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit = { deps, &envoy_config_core_v3_base_proto_upb_file_layout, "envoy/config/core/v3/base.proto", - UPB_STRINGVIEW_INIT(descriptor, 5559) + UPB_STRINGVIEW_INIT(descriptor, 6697) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h index eda8aed61c..d70869d290 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h @@ -78,6 +78,21 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RuntimeFeatureFlag_getmsgd return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RuntimeFeatureFlag"); } +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValue_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValue"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValueAppend_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValueAppend"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValueMutation_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValueMutation"); +} + UPB_INLINE const upb_MessageDef *envoy_config_core_v3_QueryParameter_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.QueryParameter"); @@ -113,6 +128,16 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_getmsgdef(upb_ return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy"); } +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_RetryPriority_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy.RetryPriority"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_RetryHostPredicate_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy.RetryHostPredicate"); +} + UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RemoteDataSource_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RemoteDataSource"); diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c index cf94304810..3fc9ea382e 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c @@ -20,7 +20,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[3037] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', +static const char descriptor[3024] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', @@ -133,15 +133,14 @@ static const char descriptor[3037] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', ' ' ', '\001', '(', '\010', 'R', ' ', 'a', 'p', 'p', 'l', 'y', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'W', 'i', 't', 'h', 'o', 'u', 't', 'W', 'a', 'r', 'm', 'i', 'n', 'g', '\022', '%', '\n', '\t', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', 's', '\030', '\004', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 't', 'y', 'p', 'e', 'U', 'r', -'l', 's', '*', '@', '\n', '\n', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\025', '\n', '\004', 'A', 'U', 'T', 'O', '\020', -'\000', '\032', '\013', '\010', '\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\023', '\n', '\002', 'V', '2', '\020', '\001', '\032', '\013', '\010', -'\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\006', '\n', '\002', 'V', '3', '\020', '\002', 'B', '\205', '\001', '\n', '\"', 'i', 'o', -'.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\021', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', -'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', -'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'l', 's', '*', '3', '\n', '\n', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', +'\000', '\022', '\023', '\n', '\002', 'V', '2', '\020', '\001', '\032', '\013', '\010', '\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\006', '\n', +'\002', 'V', '3', '\020', '\002', 'B', '\205', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\021', 'C', 'o', 'n', 'f', +'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', +'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', +'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', +'3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[12] = { @@ -163,5 +162,5 @@ _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit = { deps, &envoy_config_core_v3_config_source_proto_upb_file_layout, "envoy/config/core/v3/config_source.proto", - UPB_STRINGVIEW_INIT(descriptor, 3037) + UPB_STRINGVIEW_INIT(descriptor, 3024) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c index a6fd22a017..39e68bb6ba 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', +static const char descriptor[5030] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', @@ -33,7 +33,7 @@ static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\322', '!', '\n', +'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\241', '#', '\n', '\013', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'L', '\n', '\n', 'e', 'n', 'v', 'o', 'y', '_', 'g', 'r', 'p', 'c', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'E', 'n', 'v', 'o', 'y', 'G', 'r', @@ -46,172 +46,181 @@ static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'L', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\005', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\032', '\336', '\001', '\n', '\t', 'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', -'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', -'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '/', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', -' ', '\001', '(', '\t', 'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\000', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', -'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', -'\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', -'l', 'i', 'c', 'y', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'E', 'n', 'v', 'o', 'y', 'G', 'r', -'p', 'c', '\032', '\372', '\034', '\n', '\n', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '\022', '&', '\n', '\n', 't', 'a', 'r', 'g', -'e', 't', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 't', 'a', -'r', 'g', 'e', 't', 'U', 'r', 'i', '\022', 'p', '\n', '\023', 'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', -'t', 'i', 'a', 'l', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'t', 'a', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', '\001', '(', '\013', '2', +'!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', +'t', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\032', '\347', '\002', +'\n', '\t', 'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', +'m', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', +'r', 'N', 'a', 'm', 'e', '\022', '/', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', +'\021', '\372', 'B', '\016', 'r', '\014', '\020', '\000', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', 'a', 'u', 't', 'h', 'o', +'r', 'i', 't', 'y', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\003', ' ', '\001', '(', +'\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'Y', '\n', '\032', 'm', 'a', 'x', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'l', 'e', +'n', 'g', 't', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\027', 'm', 'a', 'x', 'R', 'e', 'c', 'e', 'i', +'v', 'e', 'M', 'e', 's', 's', 'a', 'g', 'e', 'L', 'e', 'n', 'g', 't', 'h', '\022', ',', '\n', '\022', 's', 'k', 'i', 'p', '_', 'e', +'n', 'v', 'o', 'y', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\020', 's', 'k', 'i', 'p', 'E', +'n', 'v', 'o', 'y', 'H', 'e', 'a', 'd', 'e', 'r', 's', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', +'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\032', '\372', '\034', '\n', '\n', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '\022', +'&', '\n', '\n', 't', 'a', 'r', 'g', 'e', 't', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'R', '\t', 't', 'a', 'r', 'g', 'e', 't', 'U', 'r', 'i', '\022', 'p', '\n', '\023', 'c', 'h', 'a', 'n', 'n', 'e', 'l', +'_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '?', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', +'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\022', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', +'a', 'l', 's', '\022', 'g', '\n', '\020', 'c', 'a', 'l', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', +' ', '\003', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', +'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\017', 'c', 'a', 'l', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '(', '\n', '\013', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\004', +' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', +'\022', '8', '\n', '\030', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '_', 'f', 'a', 'c', 't', 'o', 'r', 'y', '_', 'n', +'a', 'm', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\026', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'a', 'c', +'t', 'o', 'r', 'y', 'N', 'a', 'm', 'e', '\022', '/', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\006', ' ', '\001', '(', '\013', '2', +'\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', +'\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '^', '\n', '\035', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'u', 'f', +'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', +'e', 'R', '\031', 'p', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', +'t', 'e', 's', '\022', '[', '\n', '\014', 'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'a', 'r', 'g', 's', '\030', '\010', ' ', '\001', '(', '\013', +'2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', +'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', +'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', 'R', '\013', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\032', '\235', '\002', '\n', +'\016', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\n', 'r', 'o', 'o', 't', '_', 'c', +'e', 'r', 't', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'r', 'o', 'o', 't', +'C', 'e', 'r', 't', 's', '\022', 'I', '\n', '\013', 'p', 'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', +'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\n', 'p', 'r', 'i', 'v', 'a', +'t', 'e', 'K', 'e', 'y', '\022', '?', '\n', '\n', 'c', 'e', 'r', 't', '_', 'c', 'h', 'a', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\013', +'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', +'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'c', 'e', 'r', 't', 'C', 'h', 'a', 'i', 'n', ':', '>', '\232', '\305', '\210', +'\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', +'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '`', '\n', '\026', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', +'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'F', '\232', '\305', '\210', '\036', 'A', '\n', '?', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', +'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', +'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '\222', '\003', '\n', '\022', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', +'t', 'i', 'a', 'l', 's', '\022', 'f', '\n', '\017', 's', 's', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', +'\001', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\016', 's', 's', 'l', 'C', 'r', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\016', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'd', 'e', 'f', 'a', 'u', +'l', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\r', 'g', 'o', 'o', 'g', 'l', 'e', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', +'r', '\n', '\021', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\001', '(', +'\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', +'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\020', 'l', +'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', +'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', +'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\210', '\017', '\n', '\017', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', +'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '#', '\n', '\014', 'a', 'c', 'c', 'e', 's', 's', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', +' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 'a', 'c', 'c', 'e', 's', 's', 'T', 'o', 'k', 'e', 'n', '\022', 'L', '\n', '\025', 'g', 'o', +'o', 'g', 'l', 'e', '_', 'c', 'o', 'm', 'p', 'u', 't', 'e', '_', 'e', 'n', 'g', 'i', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', +'\000', 'R', '\023', 'g', 'o', 'o', 'g', 'l', 'e', 'C', 'o', 'm', 'p', 'u', 't', 'e', 'E', 'n', 'g', 'i', 'n', 'e', '\022', '2', '\n', +'\024', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 't', 'o', 'k', 'e', 'n', '\030', '\003', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\022', 'g', 'o', 'o', 'g', 'l', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'T', 'o', 'k', 'e', 'n', '\022', +'\236', '\001', '\n', '\032', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'a', 'c', 'c', 'o', 'u', 'n', 't', '_', 'j', 'w', 't', '_', 'a', +'c', 'c', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', -'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'R', '\022', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', 'g', '\n', '\020', -'c', 'a', 'l', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '<', '.', +'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\027', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', +'t', 'J', 'w', 't', 'A', 'c', 'c', 'e', 's', 's', '\022', 'r', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'i', 'a', 'm', '\030', +'\005', ' ', '\001', '(', '\013', '2', 'Q', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', +'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 'I', 'a', +'m', '\022', '}', '\n', '\013', 'f', 'r', 'o', 'm', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\006', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\017', 'c', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', '\022', '(', '\n', '\013', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\007', '\372', -'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '8', '\n', '\030', 'c', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '_', 'f', 'a', 'c', 't', 'o', 'r', 'y', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\001', -'(', '\t', 'R', '\026', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'a', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', -'e', '\022', '/', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\006', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', -'\022', '^', '\n', '\035', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', -'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\031', 'p', 'e', 'r', 'S', -'t', 'r', 'e', 'a', 'm', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', '[', '\n', '\014', -'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'a', 'r', 'g', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', -'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', -'s', 'R', '\013', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\032', '\235', '\002', '\n', '\016', 'S', 's', 'l', 'C', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\n', 'r', 'o', 'o', 't', '_', 'c', 'e', 'r', 't', 's', '\030', '\001', ' ', -'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'r', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\022', 'I', -'\n', '\013', 'p', 'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', -'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\n', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', '\022', '?', -'\n', '\n', 'c', 'e', 'r', 't', '_', 'c', 'h', 'a', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', -'c', 'e', 'R', '\t', 'c', 'e', 'r', 't', 'C', 'h', 'a', 'i', 'n', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', -'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '\032', '`', '\n', '\026', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', -'a', 'l', 's', ':', 'F', '\232', '\305', '\210', '\036', 'A', '\n', '?', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', -'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', -'\032', '\222', '\003', '\n', '\022', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', 'f', -'\n', '\017', 's', 's', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', +'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\n', 'f', 'r', 'o', 'm', 'P', 'l', 'u', +'g', 'i', 'n', '\022', 'j', '\n', '\013', 's', 't', 's', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', +'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', +'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', +'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'H', '\000', 'R', +'\n', 's', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\032', '\331', '\001', '\n', '\"', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', +'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', +'\022', '\031', '\n', '\010', 'j', 's', 'o', 'n', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'j', 's', 'o', 'n', 'K', +'e', 'y', '\022', '4', '\n', '\026', 't', 'o', 'k', 'e', 'n', '_', 'l', 'i', 'f', 'e', 't', 'i', 'm', 'e', '_', 's', 'e', 'c', 'o', +'n', 'd', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 't', 'o', 'k', 'e', 'n', 'L', 'i', 'f', 'e', 't', 'i', 'm', 'e', 'S', +'e', 'c', 'o', 'n', 'd', 's', ':', 'b', '\232', '\305', '\210', '\036', ']', '\n', '[', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', +'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', +'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', +'n', 't', 'i', 'a', 'l', 's', '\032', '\314', '\001', '\n', '\024', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', +'n', 't', 'i', 'a', 'l', 's', '\022', '/', '\n', '\023', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', '_', 't', +'o', 'k', 'e', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', +'T', 'o', 'k', 'e', 'n', '\022', '-', '\n', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '_', 's', 'e', 'l', 'e', 'c', 't', +'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\021', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'S', 'e', 'l', 'e', 'c', 't', +'o', 'r', ':', 'T', '\232', '\305', '\210', '\036', 'O', '\n', 'M', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', +'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', +'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '\352', '\001', '\n', '\035', 'M', 'e', 't', 'a', 'd', 'a', 't', +'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\022', '\022', '\n', +'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', +'d', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', +'g', ':', ']', '\232', '\305', '\210', '\036', 'X', '\n', 'V', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', +'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', +'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', +'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', 'B', '\r', '\n', '\013', +'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', +'\032', '\327', '\003', '\n', '\n', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', ';', '\n', '\032', 't', 'o', 'k', 'e', 'n', '_', +'e', 'x', 'c', 'h', 'a', 'n', 'g', 'e', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\027', 't', 'o', 'k', 'e', 'n', 'E', 'x', 'c', 'h', 'a', 'n', 'g', 'e', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'U', 'r', +'i', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'r', 'e', 's', 'o', +'u', 'r', 'c', 'e', '\022', '\032', '\n', '\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\010', 'a', +'u', 'd', 'i', 'e', 'n', 'c', 'e', '\022', '\024', '\n', '\005', 's', 'c', 'o', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\005', 's', +'c', 'o', 'p', 'e', '\022', '0', '\n', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 't', 'o', 'k', 'e', 'n', '_', 't', +'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', 'T', 'o', 'k', 'e', 'n', +'T', 'y', 'p', 'e', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', 't', +'h', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', +'T', 'o', 'k', 'e', 'n', 'P', 'a', 't', 'h', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', +'n', '_', 't', 'y', 'p', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', +'b', 'j', 'e', 'c', 't', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', +'o', 'k', 'e', 'n', '_', 'p', 'a', 't', 'h', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', +'e', 'n', 'P', 'a', 't', 'h', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', +'e', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', ':', 'J', +'\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', +'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', +'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', +'?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', +'.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', +'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', +'i', 'a', 'l', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\303', '\002', '\n', '\013', 'C', 'h', +'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\022', 'V', '\n', '\004', 'a', 'r', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', -'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\016', 's', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '\022', '?', '\n', '\016', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', '\030', '\002', ' ', '\001', '(', -'\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', -'H', '\000', 'R', '\r', 'g', 'o', 'o', 'g', 'l', 'e', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', 'r', '\n', '\021', 'l', 'o', 'c', 'a', -'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', +'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', +'e', 'l', 'A', 'r', 'g', 's', '.', 'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\004', 'a', 'r', 'g', 's', '\032', 'c', '\n', +'\005', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', +'\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', '\t', 'i', 'n', 't', +'_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\010', 'i', 'n', 't', 'V', 'a', 'l', 'u', 'e', 'B', +'\026', '\n', '\017', 'v', 'a', 'l', 'u', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'w', +'\n', '\t', 'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\003', 'k', 'e', 'y', '\022', 'T', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', -'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\020', 'l', 'o', 'c', 'a', 'l', 'C', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', -'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', -'\022', '\003', '\370', 'B', '\001', '\032', '\210', '\017', '\n', '\017', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', -'\022', '#', '\n', '\014', 'a', 'c', 'c', 'e', 's', 's', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', -'\013', 'a', 'c', 'c', 'e', 's', 's', 'T', 'o', 'k', 'e', 'n', '\022', 'L', '\n', '\025', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'c', 'o', -'m', 'p', 'u', 't', 'e', '_', 'e', 'n', 'g', 'i', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\023', 'g', 'o', 'o', 'g', -'l', 'e', 'C', 'o', 'm', 'p', 'u', 't', 'e', 'E', 'n', 'g', 'i', 'n', 'e', '\022', '2', '\n', '\024', 'g', 'o', 'o', 'g', 'l', 'e', -'_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 't', 'o', 'k', 'e', 'n', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\022', 'g', -'o', 'o', 'g', 'l', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'T', 'o', 'k', 'e', 'n', '\022', '\236', '\001', '\n', '\032', 's', 'e', 'r', -'v', 'i', 'c', 'e', '_', 'a', 'c', 'c', 'o', 'u', 'n', 't', '_', 'j', 'w', 't', '_', 'a', 'c', 'c', 'e', 's', 's', '\030', '\004', -' ', '\001', '(', '\013', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', -'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', -'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'H', '\000', 'R', '\027', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'w', 't', 'A', 'c', 'c', -'e', 's', 's', '\022', 'r', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'i', 'a', 'm', '\030', '\005', ' ', '\001', '(', '\013', '2', 'Q', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', -'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', -'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 'I', 'a', 'm', '\022', '}', '\n', '\013', 'f', 'r', -'o', 'm', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\006', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', -'.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', -'m', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\n', 'f', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\022', 'j', '\n', '\013', -'s', 't', 's', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', -'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', -'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'H', '\000', 'R', '\n', 's', 't', 's', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '\032', '\331', '\001', '\n', '\"', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', -'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '\031', '\n', '\010', 'j', 's', 'o', -'n', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'j', 's', 'o', 'n', 'K', 'e', 'y', '\022', '4', '\n', '\026', 't', -'o', 'k', 'e', 'n', '_', 'l', 'i', 'f', 'e', 't', 'i', 'm', 'e', '_', 's', 'e', 'c', 'o', 'n', 'd', 's', '\030', '\002', ' ', '\001', -'(', '\004', 'R', '\024', 't', 'o', 'k', 'e', 'n', 'L', 'i', 'f', 'e', 't', 'i', 'm', 'e', 'S', 'e', 'c', 'o', 'n', 'd', 's', ':', -'b', '\232', '\305', '\210', '\036', ']', '\n', '[', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', -'.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', -'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', -'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', -'\314', '\001', '\n', '\024', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', -'/', '\n', '\023', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', ' ', -'\001', '(', '\t', 'R', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'T', 'o', 'k', 'e', 'n', '\022', '-', -'\n', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '_', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', -'\t', 'R', '\021', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', ':', 'T', '\232', '\305', '\210', -'\036', 'O', '\n', 'M', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', -'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', -'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', '\032', '\352', '\001', '\n', '\035', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', -'t', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', -'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', ']', '\232', '\305', '\210', '\036', -'X', '\n', 'V', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', -'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', -'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'t', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\327', '\003', '\n', '\n', 'S', 't', -'s', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', ';', '\n', '\032', 't', 'o', 'k', 'e', 'n', '_', 'e', 'x', 'c', 'h', 'a', 'n', 'g', -'e', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\027', 't', 'o', 'k', 'e', -'n', 'E', 'x', 'c', 'h', 'a', 'n', 'g', 'e', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'U', 'r', 'i', '\022', '\032', '\n', '\010', 'r', 'e', -'s', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '\032', '\n', -'\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', -'\022', '\024', '\n', '\005', 's', 'c', 'o', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\005', 's', 'c', 'o', 'p', 'e', '\022', '0', '\n', -'\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', -'(', '\t', 'R', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '5', '\n', -'\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', 't', 'h', '\030', '\006', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', 'T', 'o', 'k', 'e', 'n', 'P', 'a', -'t', 'h', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', -'\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', 'T', 'o', -'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', -'t', 'h', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'P', 'a', 't', 'h', '\022', -'(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', '\t', ' ', '\001', '(', '\t', -'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', ':', 'J', '\232', '\305', '\210', '\036', 'E', '\n', 'C', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', -'8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', -'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', -'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', 'e', -'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\303', '\002', '\n', '\013', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', -'g', 's', '\022', 'V', '\n', '\004', 'a', 'r', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', -'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '.', -'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\004', 'a', 'r', 'g', 's', '\032', 'c', '\n', '\005', 'V', 'a', 'l', 'u', 'e', '\022', -'#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', -'s', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', '\t', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', -'\002', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\010', 'i', 'n', 't', 'V', 'a', 'l', 'u', 'e', 'B', '\026', '\n', '\017', 'v', 'a', 'l', 'u', -'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'w', '\n', '\t', 'A', 'r', 'g', 's', 'E', -'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', 'T', '\n', -'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', -'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '.', 'V', 'a', 'l', 'u', -'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', -'.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', -'\027', '\n', '\020', 't', 'a', 'r', 'g', 'e', 't', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', -'\004', '\010', '\004', '\020', '\005', 'B', '\204', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\020', 'G', 'r', 'p', 'c', -'S', 'e', 'r', 'v', 'i', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', -'m', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', -'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', -';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', +'g', 's', '.', 'V', 'a', 'l', 'u', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '/', '\232', '\305', '\210', '\036', +'*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', +'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', ':', '$', '\232', '\305', '\210', '\036', '\037', +'\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'B', '\027', '\n', '\020', 't', 'a', 'r', 'g', 'e', 't', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', +'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'B', '\204', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', +'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', 'B', '\020', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', +'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', +'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', +'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -232,5 +241,5 @@ _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit = { deps, &envoy_config_core_v3_grpc_service_proto_upb_file_layout, "envoy/config/core/v3/grpc_service.proto", - UPB_STRINGVIEW_INIT(descriptor, 4823) + UPB_STRINGVIEW_INIT(descriptor, 5030) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c index 3550943637..2d6109ac00 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c @@ -12,6 +12,7 @@ extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_event_service_config_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit; +extern _upb_DefPool_Init envoy_config_core_v3_proxy_protocol_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit; @@ -23,205 +24,214 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4812] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', +static const char descriptor[5014] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', -'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', -'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\030', 'e', 'n', 'v', 'o', -'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'e', 'n', 'v', -'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', -'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', -'\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', -'t', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', -'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', -'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', -'t', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '`', '\n', '\017', -'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', 'S', 'e', 't', '\022', 'M', '\n', '\010', 's', 't', 'a', 't', 'u', 's', -'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', -'\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\"', '\355', '\036', '\n', '\013', 'H', -'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '?', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', -'\022', 'A', '\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', -'\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '@', '\n', '\016', 'i', 'n', 'i', 't', -'i', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\024', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'i', 'n', 'i', 't', 'i', -'a', 'l', 'J', 'i', 't', 't', 'e', 'r', '\022', 'B', '\n', '\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', -'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', -'r', '\022', '6', '\n', '\027', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '_', 'p', 'e', 'r', 'c', -'e', 'n', 't', '\030', '\022', ' ', '\001', '(', '\r', 'R', '\025', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', -'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'W', '\n', '\023', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', 'e', -'s', 'h', 'o', 'l', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', -'\001', 'R', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'S', '\n', '\021', -'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', -'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\020', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', -'e', 's', 'h', 'o', 'l', 'd', '\022', '7', '\n', '\010', 'a', 'l', 't', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', -'\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', -'a', 'l', 'u', 'e', 'R', '\007', 'a', 'l', 't', 'P', 'o', 'r', 't', '\022', 'E', '\n', '\020', 'r', 'e', 'u', 's', 'e', '_', 'c', 'o', -'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'r', 'e', 'u', 's', 'e', 'C', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', '_', '\n', '\021', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', -'c', 'h', 'e', 'c', 'k', '\030', '\010', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', -'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', 'h', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', -'h', 'C', 'h', 'e', 'c', 'k', '\022', '\\', '\n', '\020', 't', 'c', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', -'k', '\030', '\t', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', -'t', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\016', 't', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', -'\022', '_', '\n', '\021', 'g', 'r', 'p', 'c', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\013', ' ', '\001', -'(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', -'e', 'c', 'k', 'H', '\000', 'R', '\017', 'g', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', 'e', '\n', -'\023', 'c', 'u', 's', 't', 'o', 'm', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\r', ' ', '\001', '(', -'\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', -'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', -'h', 'e', 'c', 'k', 'H', '\000', 'R', '\021', 'c', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', -'\022', 'S', '\n', '\023', 'n', 'o', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\014', -' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', -'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\021', 'n', 'o', 'T', 'r', 'a', 'f', 'f', -'i', 'c', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'b', '\n', '\033', 'n', 'o', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', -'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', +'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', +'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', +'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', +'s', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\030', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', +'v', '3', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', +'/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', +'/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', +'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', +'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', +'t', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', +'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', +'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', +'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '`', '\n', '\017', 'H', 'e', 'a', 'l', 't', 'h', 'S', +'t', 'a', 't', 'u', 's', 'S', 'e', 't', '\022', 'M', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', '\003', '(', +'\016', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', +'\020', '\001', 'R', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\"', '\214', ' ', '\n', '\013', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', +'e', 'c', 'k', '\022', '?', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', +'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'A', '\n', '\010', 'i', 'n', 't', +'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', +'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '@', '\n', '\016', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'j', 'i', 't', +'t', 'e', 'r', '\030', '\024', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'J', 'i', 't', 't', 'e', +'r', '\022', 'B', '\n', '\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', +'\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', +'i', 'o', 'n', 'R', '\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', '\022', '6', '\n', '\027', 'i', 'n', +'t', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\022', ' ', '\001', +'(', '\r', 'R', '\025', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', 'P', 'e', 'r', 'c', 'e', 'n', 't', +'\022', 'W', '\n', '\023', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\004', +' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', +'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\022', 'u', 'n', 'h', 'e', +'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'S', '\n', '\021', 'h', 'e', 'a', 'l', 't', 'h', 'y', +'_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\020', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', +'7', '\n', '\010', 'a', 'l', 't', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'a', +'l', 't', 'P', 'o', 'r', 't', '\022', 'E', '\n', '\020', 'r', 'e', 'u', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'r', 'e', 'u', 's', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '\022', '_', '\n', '\021', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\010', +' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', +'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', 'h', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', +'\\', '\n', '\020', 't', 'c', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\t', ' ', '\001', '(', '\013', +'2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', +'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', +'H', '\000', 'R', '\016', 't', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '_', '\n', '\021', 'g', 'r', 'p', +'c', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\013', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', +'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', +'g', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', 'e', '\n', '\023', 'c', 'u', 's', 't', 'o', 'm', +'_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\r', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', +'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', +'\021', 'c', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', 'S', '\n', '\023', 'n', 'o', '_', +'t', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\014', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', -'\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\030', 'n', 'o', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'H', 'e', 'a', 'l', 't', -'h', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'R', '\n', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'i', -'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\016', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', -'R', '\021', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '[', '\n', '\027', 'u', 'n', -'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\017', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\025', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', -'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'W', '\n', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', -'d', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', -'\252', '\001', '\002', '*', '\000', 'R', '\023', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', -'l', '\022', '1', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', '(', '\t', -'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', -'t', 'h', '\022', 'M', '\n', '\014', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\031', ' ', '\003', '(', '\013', '2', -'*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', -'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 'e', 'v', 'e', 'n', 't', -'L', 'o', 'g', 'g', 'e', 'r', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\026', -' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'e', 'v', -'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'F', '\n', ' ', 'a', 'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', -'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 's', '\030', '\023', ' ', '\001', -'(', '\010', 'R', '\034', 'a', 'l', 'w', 'a', 'y', 's', 'L', 'o', 'g', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', -'a', 'i', 'l', 'u', 'r', 'e', 's', '\022', 'M', '\n', '\013', 't', 'l', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\025', ' ', -'\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', -'\n', 't', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '^', '\n', '\037', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', -'s', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 'c', 'r', 'i', 't', 'e', 'r', 'i', 'a', '\030', '\027', ' ', '\001', -'(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', -'c', 't', 'R', '\034', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'C', -'r', 'i', 't', 'e', 'r', 'i', 'a', '\032', '\200', '\001', '\n', '\007', 'P', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\035', '\n', '\004', 't', 'e', -'x', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\004', 't', 'e', 'x', 't', -'\022', '\030', '\n', '\006', 'b', 'i', 'n', 'a', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\006', 'b', 'i', 'n', 'a', 'r', -'y', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', -'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'B', '\016', '\n', -'\007', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\003', '\370', 'B', '\001', '\032', '\314', '\007', '\n', '\017', 'H', 't', 't', 'p', 'H', 'e', 'a', -'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\037', '\n', '\004', 'h', 'o', 's', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', -'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\004', 'h', 'o', 's', 't', '\022', '!', '\n', '\004', 'p', 'a', 't', 'h', '\030', -'\002', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\004', 'p', 'a', 't', -'h', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', -'.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', -'\030', '\004', ' ', '\003', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', -'\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\022', 'W', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'u', 'f', 'f', -'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '2', '\002', -'(', '\000', 'R', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'i', 'z', 'e', '\022', 'g', '\n', -'\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\006', -' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', -'\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', -'d', 'd', '\022', 'K', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', -'r', 'e', 'm', 'o', 'v', 'e', '\030', '\010', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', '\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', -'\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', -'m', 'o', 'v', 'e', '\022', 'F', '\n', '\021', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', '_', 's', 't', 'a', 't', 'u', 's', 'e', 's', -'\030', '\t', ' ', '\003', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', -'t', '6', '4', 'R', 'a', 'n', 'g', 'e', 'R', '\020', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', 'S', 't', 'a', 't', 'u', 's', 'e', -'s', '\022', 'H', '\n', '\022', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\014', -' ', '\003', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', -'4', 'R', 'a', 'n', 'g', 'e', 'R', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'e', 's', -'\022', 'T', '\n', '\021', 'c', 'o', 'd', 'e', 'c', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 't', 'y', 'p', 'e', '\030', '\n', ' ', '\001', -'(', '\016', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'C', 'o', 'd', 'e', 'c', 'C', -'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\017', 'c', 'o', 'd', 'e', -'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', 'V', '\n', '\024', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', -'m', 'e', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', -'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', -'c', 'h', 'e', 'r', 'R', '\022', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', -'G', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\r', ' ', '\001', '(', '\016', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', -'o', 'd', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\006', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', ':', '4', '\232', -'\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', -'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', -'k', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\007', '\020', '\010', 'R', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', -'m', 'e', 'R', '\t', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '2', '\032', '\311', '\001', '\n', '\016', 'T', 'c', 'p', 'H', 'e', 'a', 'l', -'t', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', -'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', 'r', -'e', 'c', 'e', 'i', 'v', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', -'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', +'\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\021', 'n', 'o', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'I', 'n', 't', 'e', 'r', +'v', 'a', 'l', '\022', 'b', '\n', '\033', 'n', 'o', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', +'_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', +'*', '\000', 'R', '\030', 'n', 'o', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'y', 'I', 'n', 't', 'e', 'r', +'v', 'a', 'l', '\022', 'R', '\n', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\030', '\016', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\021', 'u', 'n', 'h', 'e', 'a', +'l', 't', 'h', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '[', '\n', '\027', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', +'_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\017', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', +'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\025', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', +'e', 'r', 'v', 'a', 'l', '\022', 'W', '\n', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', +'e', 'r', 'v', 'a', 'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\023', +'h', 'e', 'a', 'l', 't', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '1', '\n', '\016', 'e', 'v', +'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', 'M', '\n', '\014', 'e', +'v', 'e', 'n', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\031', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'g', 'e', 'r', '\022', +'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\026', ' ', '\001', '(', '\013', '2', '(', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'v', 'e', 'n', +'t', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', +'i', 'c', 'e', '\022', 'F', '\n', ' ', 'a', 'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', +'c', 'h', 'e', 'c', 'k', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 's', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\034', 'a', 'l', 'w', +'a', 'y', 's', 'L', 'o', 'g', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 's', +'\022', 'D', '\n', '\037', 'a', 'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', +'c', 'k', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\033', 'a', 'l', 'w', 'a', 'y', 's', 'L', +'o', 'g', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'S', 'u', 'c', 'c', 'e', 's', 's', '\022', 'M', '\n', '\013', 't', +'l', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', +'k', '.', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\n', 't', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'^', '\n', '\037', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', +'_', 'c', 'r', 'i', 't', 'e', 'r', 'i', 'a', '\030', '\027', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\034', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', +'t', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'C', 'r', 'i', 't', 'e', 'r', 'i', 'a', '\032', '\200', '\001', '\n', '\007', +'P', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\035', '\n', '\004', 't', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', +'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\004', 't', 'e', 'x', 't', '\022', '\030', '\n', '\006', 'b', 'i', 'n', 'a', 'r', 'y', '\030', '\002', +' ', '\001', '(', '\014', 'H', '\000', 'R', '\006', 'b', 'i', 'n', 'a', 'r', 'y', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', -'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '[', '\n', '\020', 'R', 'e', 'd', 'i', -'s', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', -'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'R', 'e', 'd', 'i', 's', 'H', -'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\364', '\001', '\n', '\017', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', -'C', 'h', 'e', 'c', 'k', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', -'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', 'a', -'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', ']', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', 'a', 'd', -'a', 't', 'a', '\030', '\003', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', -'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', 'a', 'd', -'a', 't', 'a', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', -'t', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\300', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', -'h', 'e', 'c', 'k', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', -'\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', -'\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', -'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', -'/', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', -'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\r', -'\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', -'i', 'g', '\032', 'd', '\n', '\n', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'a', 'l', 'p', 'n', '_', -'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', 'n', 'P', 'r', 'o', 't', -'o', 'c', 'o', 'l', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', 's', 'O', 'p', 't', -'i', 'o', 'n', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\025', '\n', '\016', 'h', 'e', 'a', 'l', -'t', 'h', '_', 'c', 'h', 'e', 'c', 'k', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\n', '\020', '\013', '*', '`', '\n', '\014', -'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', -'\022', '\013', '\n', '\007', 'H', 'E', 'A', 'L', 'T', 'H', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', 'U', 'N', 'H', 'E', 'A', 'L', 'T', 'H', -'Y', '\020', '\002', '\022', '\014', '\n', '\010', 'D', 'R', 'A', 'I', 'N', 'I', 'N', 'G', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'I', 'M', 'E', -'O', 'U', 'T', '\020', '\004', '\022', '\014', '\n', '\010', 'D', 'E', 'G', 'R', 'A', 'D', 'E', 'D', '\020', '\005', 'B', '\204', '\001', '\n', '\"', 'i', -'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\020', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'P', 'r', 'o', 't', -'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', -'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'B', '\016', '\n', '\007', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\003', '\370', 'B', +'\001', '\032', '\306', '\007', '\n', '\017', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\034', '\n', '\004', +'h', 'o', 's', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\010', '\372', 'B', '\005', 'r', '\003', '\300', '\001', '\002', 'R', '\004', 'h', 'o', 's', +'t', '\022', '\036', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', '\007', 'r', '\005', '\020', '\001', '\300', +'\001', '\002', 'R', '\004', 'p', 'a', 't', 'h', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', ')', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', +'t', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', +'r', 'e', 'c', 'e', 'i', 'v', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', +'a', 'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\022', 'W', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', +'B', '\007', '\372', 'B', '\004', '2', '\002', '(', '\000', 'R', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'u', 'f', 'f', 'e', 'r', +'S', 'i', 'z', 'e', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', +'o', '_', 'a', 'd', 'd', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', +'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', +'d', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'K', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', +'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\010', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', '\222', +'\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', +'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', 'F', '\n', '\021', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', '_', 's', +'t', 'a', 't', 'u', 's', 'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'R', '\020', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', +'S', 't', 'a', 't', 'u', 's', 'e', 's', '\022', 'H', '\n', '\022', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', +'t', 'u', 's', 'e', 's', '\030', '\014', ' ', '\003', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', +'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'R', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'S', +'t', 'a', 't', 'u', 's', 'e', 's', '\022', 'T', '\n', '\021', 'c', 'o', 'd', 'e', 'c', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 't', +'y', 'p', 'e', '\030', '\n', ' ', '\001', '(', '\016', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', +'.', 'C', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', +'\001', 'R', '\017', 'c', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', 'V', '\n', '\024', 's', 'e', 'r', +'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '$', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', +'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\022', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', 'M', +'a', 't', 'c', 'h', 'e', 'r', '\022', 'G', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\r', ' ', '\001', '(', '\016', '2', '#', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'q', 'u', +'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\006', 'R', '\006', 'm', 'e', +'t', 'h', 'o', 'd', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', +'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\007', '\020', '\010', 'R', '\014', 's', 'e', 'r', +'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', 'R', '\t', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '2', '\032', '\250', '\002', '\n', '\016', +'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\001', ' ', +'\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', +'n', 'd', '\022', 'C', '\n', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', +'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\022', ']', '\n', '\025', +'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', +'(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'.', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'p', 'r', 'o', +'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', +'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '[', '\n', '\020', 'R', 'e', +'d', 'i', 's', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', +'(', '\t', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'R', 'e', 'd', 'i', +'s', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\364', '\001', '\n', '\017', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', +'t', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', +' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\t', 'a', 'u', 't', 'h', +'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', +'\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', ']', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', '\030', '\003', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', +'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', +'a', 'd', 'a', 't', 'a', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\300', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', +'h', 'C', 'h', 'e', 'c', 'k', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '6', '\232', '\305', '\210', '\036', +'1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', +'t', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', +'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', +'n', 'f', 'i', 'g', '\032', 'd', '\n', '\n', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'a', 'l', 'p', +'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', 'n', 'P', 'r', +'o', 't', 'o', 'c', 'o', 'l', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', 's', 'O', +'p', 't', 'i', 'o', 'n', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\025', '\n', '\016', 'h', 'e', +'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\n', '\020', '\013', '*', '`', +'\n', '\014', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', +'\020', '\000', '\022', '\013', '\n', '\007', 'H', 'E', 'A', 'L', 'T', 'H', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', 'U', 'N', 'H', 'E', 'A', 'L', +'T', 'H', 'Y', '\020', '\002', '\022', '\014', '\n', '\010', 'D', 'R', 'A', 'I', 'N', 'I', 'N', 'G', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'I', +'M', 'E', 'O', 'U', 'T', '\020', '\004', '\022', '\014', '\n', '\010', 'D', 'E', 'G', 'R', 'A', 'D', 'E', 'D', '\020', '\005', 'B', '\204', '\001', '\n', +'\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\020', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'P', 'r', +'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', +'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[15] = { +static _upb_DefPool_Init *deps[16] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_event_service_config_proto_upbdefinit, &envoy_config_core_v3_extension_proto_upbdefinit, + &envoy_config_core_v3_proxy_protocol_proto_upbdefinit, &envoy_type_matcher_v3_string_proto_upbdefinit, &envoy_type_v3_http_proto_upbdefinit, &envoy_type_v3_range_proto_upbdefinit, @@ -240,5 +250,5 @@ _upb_DefPool_Init envoy_config_core_v3_health_check_proto_upbdefinit = { deps, &envoy_config_core_v3_health_check_proto_upb_file_layout, "envoy/config/core/v3/health_check.proto", - UPB_STRINGVIEW_INIT(descriptor, 4812) + UPB_STRINGVIEW_INIT(descriptor, 5014) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c index 713bf4cff2..46aa7784fa 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c @@ -18,7 +18,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', +static const char descriptor[6988] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', @@ -42,7 +42,7 @@ static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', ' 'n', 'i', 't', 'i', 'a', 'l', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '\"', '\000', '2', '\002', '\010', '\001', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'I', 'n', 't', 'e', -'r', 'v', 'a', 'l', '\"', '\223', '\005', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', +'r', 'v', 'a', 'l', '\"', '\361', '\005', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '[', '\n', '\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', @@ -68,229 +68,236 @@ static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', ' 'p', 't', 'i', 'o', 'n', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ':', '\n', '\031', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\027', 'c', 'l', 'i', 'e', 'n', 't', 'C', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\344', '\001', '\n', '\033', 'U', 'p', 's', 't', -'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\031', -'\n', '\010', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\007', 'a', 'u', 't', 'o', 'S', 'n', 'i', -'\022', '.', '\n', '\023', 'a', 'u', 't', 'o', '_', 's', 'a', 'n', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\002', -' ', '\001', '(', '\010', 'R', '\021', 'a', 'u', 't', 'o', 'S', 'a', 'n', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'D', -'\n', '\030', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '_', 'h', 'e', 'a', 'd', 'e', -'r', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\025', 'o', 'v', 'e', -'r', 'r', 'i', 'd', 'e', 'A', 'u', 't', 'o', 'S', 'n', 'i', 'H', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', -'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'U', 'p', 's', 't', 'r', -'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\206', '\004', -'\n', '\036', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', -'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'F', '\n', '\013', 'm', 'a', 'x', '_', 'e', 'n', 't', 'r', 'i', 'e', -'s', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', ' ', '\000', 'R', '\n', 'm', 'a', -'x', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '_', '\n', '\026', 'k', 'e', 'y', '_', 'v', 'a', 'l', 'u', 'e', '_', 's', 't', 'o', -'r', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'k', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'S', 't', 'o', 'r', 'e', 'C', -'o', 'n', 'f', 'i', 'g', '\022', '\204', '\001', '\n', '\024', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', '_', 'e', 'n', -'t', 'r', 'i', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', 'Q', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', -'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', -'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', 'R', '\023', 'p', 'r', 'e', 'p', -'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '-', '\n', '\022', 'c', 'a', 'n', 'o', 'n', 'i', -'c', 'a', 'l', '_', 's', 'u', 'f', 'f', 'i', 'x', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\021', 'c', 'a', 'n', 'o', 'n', -'i', 'c', 'a', 'l', 'S', 'u', 'f', 'f', 'i', 'x', 'e', 's', '\032', 'h', '\n', '\034', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', -'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', '\022', '\'', '\n', '\010', 'h', 'o', -'s', 't', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', -'R', '\010', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '\037', '\n', '\004', 'p', 'o', 'r', 't', '\030', '\002', ' ', '\001', '(', '\r', 'B', -'\013', '\372', 'B', '\010', '*', '\006', '\020', '\377', '\377', '\003', ' ', '\000', 'R', '\004', 'p', 'o', 'r', 't', '\"', '\257', '\005', '\n', '\023', 'H', 't', -'t', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', -'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', -'e', 'o', 'u', 't', '\022', 'Q', '\n', '\027', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'u', -'r', 'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\025', 'm', 'a', 'x', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'Q', '\n', '\021', 'm', 'a', 'x', '_', 'h', 'e', 'a', 'd', 'e', -'r', 's', '_', 'c', 'o', 'u', 'n', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '(', '\001', 'R', '\017', 'm', 'a', 'x', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'C', 'o', 'u', 'n', 't', '\022', 'I', '\n', '\023', 'm', -'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\013', '2', -'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', -'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\215', '\001', '\n', '\037', -'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'w', 'i', 't', 'h', '_', 'u', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', '_', -'a', 'c', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', -'t', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', -'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\034', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', -'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '[', '\n', '\033', 'm', 'a', 'x', '_', 'r', 'e', 'q', -'u', 'e', 's', 't', 's', '_', 'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\006', ' ', '\001', '(', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\\', '\n', '\024', 'i', 'd', 'l', 'e', '_', +'n', 'e', 't', 'w', 'o', 'r', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\017', +'\372', 'B', '\014', '\252', '\001', '\t', '\"', '\003', '\010', '\330', '\004', '2', '\002', '\010', '\001', 'R', '\022', 'i', 'd', 'l', 'e', 'N', 'e', 't', 'w', +'o', 'r', 'k', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\"', '\344', '\001', '\n', '\033', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', +'t', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\031', '\n', '\010', 'a', 'u', 't', 'o', +'_', 's', 'n', 'i', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\007', 'a', 'u', 't', 'o', 'S', 'n', 'i', '\022', '.', '\n', '\023', 'a', 'u', +'t', 'o', '_', 's', 'a', 'n', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\021', +'a', 'u', 't', 'o', 'S', 'a', 'n', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\030', 'o', 'v', 'e', 'r', +'r', 'i', 'd', 'e', '_', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\003', ' ', '\001', '(', +'\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\025', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'A', +'u', 't', 'o', 'S', 'n', 'i', 'H', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', +'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\206', '\004', '\n', '\036', 'A', 'l', 't', 'e', +'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', +'s', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', '\022', 'F', '\n', '\013', 'm', 'a', 'x', '_', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', -'2', 'V', 'a', 'l', 'u', 'e', 'R', '\030', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'P', 'e', 'r', 'C', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', '\"', 'N', '\n', '\034', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', -'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\000', -'\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\001', '\022', '\017', '\n', '\013', 'D', -'R', 'O', 'P', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\002', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\223', '\t', '\n', '\024', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'H', '\n', '\022', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'b', 's', 'o', 'l', 'u', 't', -'e', '_', 'u', 'r', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'a', 'l', 'l', 'o', 'w', 'A', 'b', 's', 'o', -'l', 'u', 't', 'e', 'U', 'r', 'l', '\022', '$', '\n', '\016', 'a', 'c', 'c', 'e', 'p', 't', '_', 'h', 't', 't', 'p', '_', '1', '0', -'\030', '\002', ' ', '\001', '(', '\010', 'R', '\014', 'a', 'c', 'c', 'e', 'p', 't', 'H', 't', 't', 'p', '1', '0', '\022', '6', '\n', '\030', 'd', -'e', 'f', 'a', 'u', 'l', 't', '_', 'h', 'o', 's', 't', '_', 'f', 'o', 'r', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\024', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'H', 'o', 's', 't', 'F', 'o', 'r', 'H', 't', 't', 'p', '1', -'0', '\022', 'f', '\n', '\021', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'k', 'e', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\004', ' ', -'\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\017', 'h', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', -'o', 'r', 'm', 'a', 't', '\022', '\'', '\n', '\017', 'e', 'n', 'a', 'b', 'l', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', -'\005', ' ', '\001', '(', '\010', 'R', '\016', 'e', 'n', 'a', 'b', 'l', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '0', '\n', '\024', -'a', 'l', 'l', 'o', 'w', '_', 'c', 'h', 'u', 'n', 'k', 'e', 'd', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\006', ' ', '\001', '(', -'\010', 'R', '\022', 'a', 'l', 'l', 'o', 'w', 'C', 'h', 'u', 'n', 'k', 'e', 'd', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'z', '\n', '-', -'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', -'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '\007', ' ', '\001', '(', -'\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', -'a', 'l', 'u', 'e', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', -'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', 'e', '\022', '7', '\n', '\030', 's', -'e', 'n', 'd', '_', 'f', 'u', 'l', 'l', 'y', '_', 'q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', '_', 'u', 'r', 'l', '\030', '\010', -' ', '\001', '(', '\010', 'R', '\025', 's', 'e', 'n', 'd', 'F', 'u', 'l', 'l', 'y', 'Q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', 'U', -'r', 'l', '\022', 'N', '\n', '\020', 'u', 's', 'e', '_', 'b', 'a', 'l', 's', 'a', '_', 'p', 'a', 'r', 's', 'e', 'r', '\030', '\t', ' ', -'\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', -'l', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\016', 'u', 's', 'e', 'B', 'a', 'l', 's', -'a', 'P', 'a', 'r', 's', 'e', 'r', '\022', ':', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', -'e', 't', 'h', 'o', 'd', 's', '\030', '\n', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\022', 'a', -'l', 'l', 'o', 'w', 'C', 'u', 's', 't', 'o', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', '\032', '\237', '\003', '\n', '\017', 'H', 'e', 'a', -'d', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'x', '\n', '\021', 'p', 'r', 'o', 'p', 'e', 'r', '_', 'c', 'a', -'s', 'e', '_', 'w', 'o', 'r', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 'J', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', -'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', 'H', '\000', 'R', '\017', 'p', 'r', 'o', 'p', 'e', 'r', -'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 'f', 'o', 'r', -'m', 'a', 't', 't', 'e', 'r', '\030', '\010', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', -'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\021', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', 'F', 'o', 'r', 'm', 'a', 't', 't', -'e', 'r', '\032', '`', '\n', '\017', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', 'M', '\232', '\305', -'\210', '\036', 'H', '\n', 'F', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', -'t', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', -'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', -':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', -'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\024', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', -'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\301', '\002', '\n', '\021', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', -'i', 'n', 'g', 's', '\022', 'C', '\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', -'\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', -'\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', -'\010', '\001', '2', '\004', '\020', '\300', '\204', '=', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '?', '\n', '\017', 'i', 'n', 't', 'e', -'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', -'.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', -'l', 'J', 'i', 't', 't', 'e', 'r', '\022', 'a', '\n', '\030', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'i', 'd', 'l', -'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', ' ', '\000', 'R', '\n', 'm', 'a', 'x', 'E', 'n', 't', 'r', 'i', +'e', 's', '\022', '_', '\n', '\026', 'k', 'e', 'y', '_', 'v', 'a', 'l', 'u', 'e', '_', 's', 't', 'o', 'r', 'e', '_', 'c', 'o', 'n', +'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\023', 'k', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'S', 't', 'o', 'r', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', +'\204', '\001', '\n', '\024', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', '_', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', +'\004', ' ', '\003', '(', '\013', '2', 'Q', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', +'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', 'R', '\023', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', +'e', 'd', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '-', '\n', '\022', 'c', 'a', 'n', 'o', 'n', 'i', 'c', 'a', 'l', '_', 's', 'u', +'f', 'f', 'i', 'x', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\021', 'c', 'a', 'n', 'o', 'n', 'i', 'c', 'a', 'l', 'S', 'u', +'f', 'f', 'i', 'x', 'e', 's', '\032', 'h', '\n', '\034', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', '\022', '\'', '\n', '\010', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', +'\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\010', 'h', 'o', 's', 't', +'n', 'a', 'm', 'e', '\022', '\037', '\n', '\004', 'p', 'o', 'r', 't', '\030', '\002', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', +'\020', '\377', '\377', '\003', ' ', '\000', 'R', '\004', 'p', 'o', 'r', 't', '\"', '\257', '\005', '\n', '\023', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', +'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'Q', +'\n', '\027', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\025', 'm', 'a', 'x', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', '\022', 'Q', '\n', '\021', 'm', 'a', 'x', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'c', 'o', 'u', +'n', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\017', 'm', +'a', 'x', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'C', 'o', 'u', 'n', 't', '\022', 'I', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', +'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', +'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\215', '\001', '\n', '\037', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '_', 'w', 'i', 't', 'h', '_', 'u', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', '_', 'a', 'c', 't', 'i', 'o', 'n', +'\030', '\005', ' ', '\001', '(', '\016', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', +'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', +'i', 'o', 'n', 'R', '\034', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', +'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '[', '\n', '\033', 'm', 'a', 'x', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', +'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', +'R', '\030', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'P', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '\"', 'N', '\n', '\034', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', +'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\000', '\022', '\022', '\n', '\016', 'R', 'E', +'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\001', '\022', '\017', '\n', '\013', 'D', 'R', 'O', 'P', '_', 'H', 'E', +'A', 'D', 'E', 'R', '\020', '\002', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '\"', '\223', '\t', '\n', '\024', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', 'H', '\n', '\022', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'b', 's', 'o', 'l', 'u', 't', 'e', '_', 'u', 'r', 'l', '\030', +'\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', +'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'a', 'l', 'l', 'o', 'w', 'A', 'b', 's', 'o', 'l', 'u', 't', 'e', 'U', 'r', +'l', '\022', '$', '\n', '\016', 'a', 'c', 'c', 'e', 'p', 't', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\002', ' ', '\001', '(', '\010', +'R', '\014', 'a', 'c', 'c', 'e', 'p', 't', 'H', 't', 't', 'p', '1', '0', '\022', '6', '\n', '\030', 'd', 'e', 'f', 'a', 'u', 'l', 't', +'_', 'h', 'o', 's', 't', '_', 'f', 'o', 'r', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\024', +'d', 'e', 'f', 'a', 'u', 'l', 't', 'H', 'o', 's', 't', 'F', 'o', 'r', 'H', 't', 't', 'p', '1', '0', '\022', 'f', '\n', '\021', 'h', +'e', 'a', 'd', 'e', 'r', '_', 'k', 'e', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', ':', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', +'1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', +'y', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\017', 'h', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\022', +'\'', '\n', '\017', 'e', 'n', 'a', 'b', 'l', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', +'\016', 'e', 'n', 'a', 'b', 'l', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '0', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', +'c', 'h', 'u', 'n', 'k', 'e', 'd', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\022', 'a', 'l', 'l', +'o', 'w', 'C', 'h', 'u', 'n', 'k', 'e', 'd', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', +'d', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', +'d', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\'', +'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', +'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', 'e', '\022', '7', '\n', '\030', 's', 'e', 'n', 'd', '_', 'f', 'u', +'l', 'l', 'y', '_', 'q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', '_', 'u', 'r', 'l', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\025', +'s', 'e', 'n', 'd', 'F', 'u', 'l', 'l', 'y', 'Q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', 'U', 'r', 'l', '\022', 'N', '\n', '\020', +'u', 's', 'e', '_', 'b', 'a', 'l', 's', 'a', '_', 'p', 'a', 'r', 's', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\016', 'u', 's', 'e', 'B', 'a', 'l', 's', 'a', 'P', 'a', 'r', 's', 'e', +'r', '\022', ':', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'e', 't', 'h', 'o', 'd', 's', +'\030', '\n', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\022', 'a', 'l', 'l', 'o', 'w', 'C', 'u', +'s', 't', 'o', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', '\032', '\237', '\003', '\n', '\017', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', +'F', 'o', 'r', 'm', 'a', 't', '\022', 'x', '\n', '\021', 'p', 'r', 'o', 'p', 'e', 'r', '_', 'c', 'a', 's', 'e', '_', 'w', 'o', 'r', +'d', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 'J', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', +'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', 'H', '\000', 'R', '\017', 'p', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', +'r', 'd', 's', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 'f', 'o', 'r', 'm', 'a', 't', 't', 'e', 'r', +'\030', '\010', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', +'H', '\000', 'R', '\021', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', 'F', 'o', 'r', 'm', 'a', 't', 't', 'e', 'r', '\032', '`', '\n', '\017', +'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', 'M', '\232', '\305', '\210', '\036', 'H', '\n', 'F', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', +'t', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', +'m', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', '=', '\232', '\305', '\210', '\036', +'8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', +'1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', +'y', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\024', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', 'o', 'r', 'm', 'a', 't', '\022', +'\003', '\370', 'B', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', +'s', '\"', '\301', '\002', '\n', '\021', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\022', 'C', +'\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', -'\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'I', 'd', 'l', 'e', 'I', 'n', -'t', 'e', 'r', 'v', 'a', 'l', '\"', '\320', '\016', '\n', '\024', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'F', '\n', '\020', 'h', 'p', 'a', 'c', 'k', '_', 't', 'a', 'b', 'l', 'e', '_', 's', 'i', 'z', -'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'h', 'p', 'a', 'c', 'k', 'T', 'a', 'b', 'l', 'e', 'S', -'i', 'z', 'e', '\022', 'a', '\n', '\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', -'e', 'a', 'm', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\r', '\372', 'B', '\n', '*', '\010', '\030', '\377', '\377', -'\377', '\377', '\007', '(', '\001', 'R', '\024', 'm', 'a', 'x', 'C', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', -'m', 's', '\022', 'j', '\n', '\032', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'n', 'd', -'o', 'w', '_', 's', 'i', 'z', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\017', '\372', 'B', '\014', '*', '\n', -'\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'S', 't', 'r', 'e', 'a', 'm', -'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', 'e', '\022', 'r', '\n', '\036', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'c', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', -'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', -'V', 'a', 'l', 'u', 'e', 'B', '\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\033', 'i', -'n', 'i', 't', 'i', 'a', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', -'e', '\022', '#', '\n', '\r', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', -'\014', 'a', 'l', 'l', 'o', 'w', 'C', 'o', 'n', 'n', 'e', 'c', 't', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', -'t', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\022', 'U', '\n', '\023', 'm', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', -'\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\021', 'm', 'a', 'x', -'O', 'u', 't', 'b', 'o', 'u', 'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', '\022', 'd', '\n', '\033', 'm', 'a', 'x', '_', 'o', 'u', 't', -'b', 'o', 'u', 'n', 'd', '_', 'c', 'o', 'n', 't', 'r', 'o', 'l', '_', 'f', 'r', 'a', 'm', 'e', 's', '\030', '\010', ' ', '\001', '(', -'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', -'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\030', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', -'u', 'n', 'd', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'F', 'r', 'a', 'm', 'e', 's', '\022', '\204', '\001', '\n', '1', 'm', 'a', 'x', '_', -'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', -'s', '_', 'w', 'i', 't', 'h', '_', 'e', 'm', 'p', 't', 'y', '_', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\030', '\t', ' ', '\001', '(', +'\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\007', 't', 'i', 'm', 'e', +'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '2', '\004', '\020', '\300', +'\204', '=', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '?', '\n', '\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', +'i', 't', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', +'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', +'r', '\022', 'a', '\n', '\030', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'i', 'd', 'l', 'e', '_', 'i', 'n', 't', 'e', +'r', 'v', 'a', 'l', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', +'=', 'R', '\026', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'I', 'd', 'l', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\"', '\320', '\016', '\n', '\024', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', +'\022', 'F', '\n', '\020', 'h', 'p', 'a', 'c', 'k', '_', 't', 'a', 'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', -'2', 'V', 'a', 'l', 'u', 'e', 'R', '+', 'm', 'a', 'x', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'I', 'n', 'b', -'o', 'u', 'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', 'W', 'i', 't', 'h', 'E', 'm', 'p', 't', 'y', 'P', 'a', 'y', 'l', 'o', 'a', -'d', '\022', 'o', '\n', '&', 'm', 'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', -'_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '\030', '\n', ' ', '\001', '(', '\013', '2', -'\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', -'a', 'l', 'u', 'e', 'R', '!', 'm', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'F', -'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', '\022', '\221', '\001', '\n', '4', 'm', 'a', 'x', '_', 'i', 'n', -'b', 'o', 'u', 'n', 'd', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 'u', 'p', 'd', 'a', 't', 'e', '_', 'f', 'r', 'a', 'm', 'e', -'s', '_', 'p', 'e', 'r', '_', 'd', 'a', 't', 'a', '_', 'f', 'r', 'a', 'm', 'e', '_', 's', 'e', 'n', 't', '\030', '\013', ' ', '\001', -'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', -'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', ',', 'm', 'a', 'x', 'I', 'n', 'b', 'o', -'u', 'n', 'd', 'W', 'i', 'n', 'd', 'o', 'w', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'D', -'a', 't', 'a', 'F', 'r', 'a', 'm', 'e', 'S', 'e', 'n', 't', '\022', '^', '\n', '&', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', -'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', -'g', 'i', 'n', 'g', '\030', '\014', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '!', -'s', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', -'e', 's', 's', 'a', 'g', 'i', 'n', 'g', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 't', 'r', 'e', -'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', -'m', 'e', 's', 's', 'a', 'g', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', -'e', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', -'M', 'e', 's', 's', 'a', 'g', 'e', '\022', 'z', '\n', '\032', 'c', 'u', 's', 't', 'o', 'm', '_', 's', 'e', 't', 't', 'i', 'n', 'g', -'s', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', -'t', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', 'R', '\030', 'c', 'u', 's', 't', 'o', 'm', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', 's', '\022', 'Z', '\n', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'k', 'e', 'e', 'p', -'a', 'l', 'i', 'v', 'e', '\030', '\017', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', -'g', 's', 'R', '\023', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'P', -'\n', '\021', 'u', 's', 'e', '_', 'o', 'g', 'h', 't', 't', 'p', '2', '_', 'c', 'o', 'd', 'e', 'c', '\030', '\020', ' ', '\001', '(', '\013', -'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', -'l', 'u', 'e', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\017', 'u', 's', 'e', 'O', 'g', 'h', 't', 't', 'p', '2', -'C', 'o', 'd', 'e', 'c', '\032', '\342', '\001', '\n', '\021', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', -'e', 'r', '\022', 'N', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', -'u', 'e', 'B', '\020', '\372', 'B', '\r', '*', '\006', '\030', '\377', '\377', '\003', '(', '\000', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'i', 'd', 'e', -'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '<', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', -'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '?', '\232', '\305', '\210', '\036', -':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', -'2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', -'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\"', '\245', '\001', '\n', '\023', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', -'t', 'i', 'o', 'n', 's', '\022', '`', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', -'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'h', 'p', 'a', 'c', 'k', 'T', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\022', 'a', '\n', +'\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 's', '\030', '\002', +' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', +'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\r', '\372', 'B', '\n', '*', '\010', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\001', 'R', +'\024', 'm', 'a', 'x', 'C', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 's', '\022', 'j', '\n', '\032', +'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 's', 'i', 'z', +'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', +'(', '\377', '\377', '\003', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'S', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'n', 'd', 'o', 'w', +'S', 'i', 'z', 'e', '\022', 'r', '\n', '\036', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', +'\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\033', 'i', 'n', 'i', 't', 'i', 'a', 'l', +'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', 'e', '\022', '#', '\n', '\r', 'a', +'l', 'l', 'o', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', +'C', 'o', 'n', 'n', 'e', 'c', 't', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', +'\030', '\006', ' ', '\001', '(', '\010', 'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'U', '\n', '\023', +'m', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', +'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', +'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\021', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', 'u', +'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', '\022', 'd', '\n', '\033', 'm', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', +'c', 'o', 'n', 't', 'r', 'o', 'l', '_', 'f', 'r', 'a', 'm', 'e', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', +'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\030', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', 'u', 'n', 'd', 'C', 'o', 'n', +'t', 'r', 'o', 'l', 'F', 'r', 'a', 'm', 'e', 's', '\022', '\204', '\001', '\n', '1', 'm', 'a', 'x', '_', 'c', 'o', 'n', 's', 'e', 'c', +'u', 't', 'i', 'v', 'e', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'w', 'i', 't', 'h', +'_', 'e', 'm', 'p', 't', 'y', '_', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', +'R', '+', 'm', 'a', 'x', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'F', 'r', +'a', 'm', 'e', 's', 'W', 'i', 't', 'h', 'E', 'm', 'p', 't', 'y', 'P', 'a', 'y', 'l', 'o', 'a', 'd', '\022', 'o', '\n', '&', 'm', +'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '_', 'f', 'r', 'a', 'm', 'e', +'s', '_', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '\030', '\n', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '!', +'m', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'F', 'r', 'a', 'm', 'e', 's', 'P', +'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', '\022', '\221', '\001', '\n', '4', 'm', 'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', +'w', 'i', 'n', 'd', 'o', 'w', '_', 'u', 'p', 'd', 'a', 't', 'e', '_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'p', 'e', 'r', '_', +'d', 'a', 't', 'a', '_', 'f', 'r', 'a', 'm', 'e', '_', 's', 'e', 'n', 't', '\030', '\013', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', +'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', ',', 'm', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'W', 'i', 'n', +'d', 'o', 'w', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'D', 'a', 't', 'a', 'F', 'r', 'a', +'m', 'e', 'S', 'e', 'n', 't', '\022', '^', '\n', '&', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', +'_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'i', 'n', 'g', '\030', '\014', +' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '!', 's', 't', 'r', 'e', 'a', 'm', +'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', 'i', +'n', 'g', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', +'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', +'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 't', 'r', 'e', 'a', +'m', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', +'e', '\022', 'z', '\n', '\032', 'c', 'u', 's', 't', 'o', 'm', '_', 's', 'e', 't', 't', 'i', 'n', 'g', 's', '_', 'p', 'a', 'r', 'a', +'m', 'e', 't', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', -'o', 'n', 's', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', -'\261', '\002', '\n', '\024', 'H', 't', 't', 'p', '3', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', -']', '\n', '\025', 'q', 'u', 'i', 'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', -'\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', -'q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '-', 'o', 'v', -'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', -'v', 'a', 'l', 'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', -'\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', -'u', 'e', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', -'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', 'e', '\022', '>', '\n', '\026', 'a', 'l', 'l', -'o', 'w', '_', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'd', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', -'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\024', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 't', 'e', 'n', 'd', 'e', 'd', -'C', 'o', 'n', 'n', 'e', 'c', 't', '\"', 't', '\n', '\032', 'S', 'c', 'h', 'e', 'm', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', -'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\023', 's', 'c', 'h', 'e', 'm', 'e', '_', 't', 'o', -'_', 'o', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\022', '\372', 'B', '\017', 'r', '\r', 'R', '\004', -'h', 't', 't', 'p', 'R', '\005', 'h', 't', 't', 'p', 's', 'H', '\000', 'R', '\021', 's', 'c', 'h', 'e', 'm', 'e', 'T', 'o', 'O', 'v', -'e', 'r', 'w', 'r', 'i', 't', 'e', 'B', '\020', '\n', '\016', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', -'B', '\201', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'P', -'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', -'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', -'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', -'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'R', +'\030', 'c', 'u', 's', 't', 'o', 'm', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', +'\022', 'Z', '\n', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'k', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', +'\017', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'R', '\023', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'P', '\n', '\021', 'u', 's', 'e', '_', +'o', 'g', 'h', 't', 't', 'p', '2', '_', 'c', 'o', 'd', 'e', 'c', '\030', '\020', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\322', +'\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\017', 'u', 's', 'e', 'O', 'g', 'h', 't', 't', 'p', '2', 'C', 'o', 'd', 'e', 'c', '\032', +'\342', '\001', '\n', '\021', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', 'N', '\n', '\n', +'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\020', '\372', 'B', +'\r', '*', '\006', '\030', '\377', '\377', '\003', '(', '\000', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', +'r', '\022', '<', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', +'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', +'t', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', +'\"', '\245', '\001', '\n', '\023', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'`', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', +'\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', +'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', ',', '\232', +'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', +'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\330', '\002', '\n', '\024', 'H', 't', +'t', 'p', '3', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\025', 'q', 'u', 'i', +'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', +')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'Q', 'u', +'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'q', 'u', 'i', 'c', 'P', 'r', +'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', +'_', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', +'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\'', 'o', 'v', +'e', 'r', 'r', 'i', 'd', 'e', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', +'d', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', 'g', 'e', '\022', '>', '\n', '\026', 'a', 'l', 'l', 'o', 'w', '_', 'e', 'x', 't', +'e', 'n', 'd', 'e', 'd', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', +'\006', '\002', '\010', '\001', 'R', '\024', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 't', 'e', 'n', 'd', 'e', 'd', 'C', 'o', 'n', 'n', 'e', 'c', +'t', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\010', +'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\"', '\233', '\001', '\n', '\032', 'S', 'c', 'h', 'e', 'm', +'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\023', +'s', 'c', 'h', 'e', 'm', 'e', '_', 't', 'o', '_', 'o', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\022', '\372', 'B', '\017', 'r', '\r', 'R', '\004', 'h', 't', 't', 'p', 'R', '\005', 'h', 't', 't', 'p', 's', 'H', '\000', 'R', '\021', 's', +'c', 'h', 'e', 'm', 'e', 'T', 'o', 'O', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\022', '%', '\n', '\016', 'm', 'a', 't', 'c', 'h', +'_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\r', 'm', 'a', 't', 'c', 'h', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'B', '\020', '\n', '\016', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 'B', '\201', +'\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'P', 'r', 'o', +'t', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', +'/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[10] = { @@ -310,5 +317,5 @@ _upb_DefPool_Init envoy_config_core_v3_protocol_proto_upbdefinit = { deps, &envoy_config_core_v3_protocol_proto_upb_file_layout, "envoy/config/core/v3/protocol.proto", - UPB_STRINGVIEW_INIT(descriptor, 6815) + UPB_STRINGVIEW_INIT(descriptor, 6988) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c index 62e23df756..c8d984a85c 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c @@ -17,7 +17,7 @@ extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2499] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', +static const char descriptor[2559] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', @@ -80,43 +80,46 @@ static const char descriptor[2499] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', ' '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'l', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '0', '\n', '\024', 'l', 'e', 'd', 's', '_', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', -'(', '\t', 'R', '\022', 'l', 'e', 'd', 's', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\"', '\341', '\005', +'(', '\t', 'R', '\022', 'l', 'e', 'd', 's', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\"', '\235', '\006', '\n', '\023', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', ':', '\n', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'R', '\010', 'l', 'o', -'c', 'a', 'l', 'i', 't', 'y', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\002', ' ', -'\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'v', '3', '.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', -'i', 'n', 't', 's', '\022', 'v', '\n', '\027', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', 'r', '_', 'e', 'n', 'd', -'p', 'o', 'i', 'n', 't', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', -'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', 'H', -'\000', 'R', '\025', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', -'v', '\n', '\034', 'l', 'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', -'c', 'o', 'n', 'f', 'i', 'g', '\030', '\010', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', -'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\031', 'l', 'e', 'd', 's', 'C', 'l', -'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\025', 'l', 'o', -'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\003', ' ', '\001', '(', '\013', -'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', -'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', -'c', 'i', 'n', 'g', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\005', ' ', -'\001', '(', '\r', 'B', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', '\001', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', ':', -'\n', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'p', -'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\032', 'Y', '\n', '\016', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', -'t', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', -'.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', ':', -'0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', -'o', 'i', 'n', 't', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'B', -'\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\227', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'v', '3', 'B', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', -'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', -'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', ';', 'e', 'n', -'d', 'p', 'o', 'i', 'n', 't', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'a', 'l', 'i', 't', 'y', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\t', ' ', '\001', '(', '\013', '2', +'\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', +'t', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'v', '\n', '\027', 'l', 'o', 'a', 'd', '_', 'b', 'a', +'l', 'a', 'n', 'c', 'e', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '<', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', +'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '.', 'L', 'b', 'E', 'n', 'd', +'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', 'H', '\000', 'R', '\025', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'r', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'v', '\n', '\034', 'l', 'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', +'_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\010', ' ', '\001', '(', '\013', '2', '3', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', +'L', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', +'H', '\000', 'R', '\031', 'l', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', +'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\025', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', 'w', 'e', +'i', 'g', 'h', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', +'\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\010', 'p', +'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\005', ' ', '\001', '(', '\r', 'B', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', '\001', 'R', '\010', +'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', ':', '\n', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\030', '\006', ' ', '\001', +'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\032', 'Y', '\n', '\016', 'L', 'b', 'E', +'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'B', '\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\227', '\001', +'\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', +'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', +'.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', +'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', +'o', 'i', 'n', 't', '/', 'v', '3', ';', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[9] = { @@ -135,5 +138,5 @@ _upb_DefPool_Init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit deps, &envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout, "envoy/config/endpoint/v3/endpoint_components.proto", - UPB_STRINGVIEW_INIT(descriptor, 2499) + UPB_STRINGVIEW_INIT(descriptor, 2559) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c index a086dc1b14..3fd2033650 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c @@ -13,10 +13,11 @@ extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit; +extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2428] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', +static const char descriptor[3123] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', @@ -24,103 +25,131 @@ static const char descriptor[2428] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', ' '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', -'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', -'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', -'/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\312', '\004', '\n', '\025', 'U', 'p', 's', -'t', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', ':', '\n', '\010', 'l', 'o', 'c', -'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'R', '\010', 'l', 'o', 'c', 'a', 'l', -'i', 't', 'y', '\022', ':', '\n', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'r', -'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', 'u', 'c', 'c', 'e', -'s', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', 'l', '_', 'r', 'e', -'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', -'\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', -'0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\004', -' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', -'2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', -'\010', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', -'s', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', -'\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', -'t', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'g', '\n', '\027', -'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\007', -' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', -'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', -'a', 't', 's', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', -'s', '\022', '\032', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\006', ' ', '\001', '(', '\r', 'R', '\010', 'p', 'r', 'i', 'o', -'r', 'i', 't', 'y', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', -'y', 'S', 't', 'a', 't', 's', '\"', '\367', '\003', '\n', '\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', -'n', 't', 'S', 't', 'a', 't', 's', '\022', '7', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', -'\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', -'d', 'r', 'e', 's', 's', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '\030', '\006', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', ':', '\n', '\031', 't', 'o', 't', 'a', -'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', -'(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', -'t', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', -'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', -'s', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', -'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', -'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', -'s', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', -'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', -'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', -'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', -'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\"', '\350', '\001', '\n', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', -'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', '\037', '\n', '\013', 'm', 'e', 't', 'r', 'i', 'c', -'_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'm', 'e', 't', 'r', 'i', 'c', 'N', 'a', 'm', 'e', '\022', 'H', -'\n', '!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', -'i', 't', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', -'e', 's', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', 'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', -'\022', 't', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\001', -'R', '\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', 'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', -'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\"', '\211', '\005', -'\n', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', -'_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', 'l', 'u', -'s', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '0', '\n', '\024', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'e', 'r', 'v', 'i', -'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\022', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'e', 'r', -'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', 'q', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', -'l', 'i', 't', 'y', '_', 's', 't', 'a', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', -'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', -'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', '4', -'\n', '\026', 't', 'o', 't', 'a', 'l', '_', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', -'\003', ' ', '\001', '(', '\004', 'R', '\024', 't', 'o', 't', 'a', 'l', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', -'t', 's', '\022', 'a', '\n', '\020', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\005', ' ', -'\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', -'d', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'R', '\017', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', -'s', '\022', 'K', '\n', '\024', 'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', -'\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\022', 'l', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'I', 'n', 't', 'e', 'r', -'v', 'a', 'l', '\032', '\226', '\001', '\n', '\017', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '#', -'\n', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', -'R', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\022', '#', '\n', '\r', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'c', 'o', 'u', -'n', 't', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\014', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'C', 'o', 'u', 'n', 't', ':', '9', '\232', -'\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', -'q', 'u', 'e', 's', 't', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'B', -'\217', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\017', 'L', 'o', 'a', 'd', 'R', 'e', -'p', 'o', 'r', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', -'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', -'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', -'3', ';', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'o', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', +'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', +'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', +'\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', +'\"', '\305', '\010', '\n', '\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', +'s', '\022', ':', '\n', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', +'y', 'R', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\022', ':', '\n', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', +'e', 's', 's', 'f', 'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', +'t', 'a', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', +'t', 'o', 't', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', +'s', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', +'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', +'q', 'u', 'e', 's', 't', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', +'e', 'q', 'u', 'e', 's', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', +'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', +'d', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'B', '\n', '\030', 't', 'o', 't', 'a', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', +'_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\t', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', '\244', '\341', '\006', +'\002', '\010', '\001', 'R', '\026', 't', 'o', 't', 'a', 'l', 'A', 'c', 't', 'i', 'v', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', 's', '\022', '<', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'n', 'e', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', 's', '\030', '\n', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\023', 't', 'o', 't', 'a', 'l', +'N', 'e', 'w', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\022', '>', '\n', '\026', 't', 'o', 't', 'a', 'l', '_', 'f', +'a', 'i', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\013', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', +'\244', '\341', '\006', '\002', '\010', '\001', 'R', '\024', 't', 'o', 't', 'a', 'l', 'F', 'a', 'i', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 's', '\022', 'a', '\n', '\017', 'c', 'p', 'u', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\030', '\014', ' ', +'\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', +'n', 't', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', +'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\016', 'c', 'p', 'u', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', +'o', 'n', '\022', 'a', '\n', '\017', 'm', 'e', 'm', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\030', '\r', ' ', '\001', +'(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', +'t', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', +'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\016', 'm', 'e', 'm', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', +'n', '\022', 'q', '\n', '\027', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', +'i', 'o', 'n', '\030', '\016', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', +'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\026', 'a', 'p', 'p', 'l', 'i', 'c', +'a', 't', 'i', 'o', 'n', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', +'m', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', +'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', +'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'g', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', 'R', '\025', 'u', 'p', 's', 't', 'r', +'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\022', '\032', '\n', '\010', 'p', 'r', 'i', 'o', 'r', +'i', 't', 'y', '\030', '\006', ' ', '\001', '(', '\r', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', ':', '2', '\232', '\305', '\210', '\036', +'-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', +'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\"', '\367', '\003', '\n', +'\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\022', '7', '\n', +'\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\007', 'a', 'd', 'd', +'r', 'e', 's', 's', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\013', '2', '\027', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\010', 'm', +'e', 't', 'a', 'd', 'a', 't', 'a', '\022', ':', '\n', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', +'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', +'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', +'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', +'\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', +'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', +'t', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', +'s', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', +'s', 't', 's', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', +'u', 'e', 's', 't', 's', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', +'s', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', +'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', +':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', +'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', +'t', 's', '\"', '\350', '\001', '\n', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', +'S', 't', 'a', 't', 's', '\022', '\037', '\n', '\013', 'm', 'e', 't', 'r', 'i', 'c', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\n', 'm', 'e', 't', 'r', 'i', 'c', 'N', 'a', 'm', 'e', '\022', 'H', '\n', '!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', +'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', 'i', 't', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', +'\030', '\002', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', +'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', '\022', 't', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', +'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\001', 'R', '\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', +'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', +'d', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\"', '\230', '\001', '\n', '\036', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', +'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'H', '\n', +'!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', 'i', +'t', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', 'e', +'s', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', 'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', '\022', +'t', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\001', 'R', +'\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', 'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', '\"', '\211', '\005', '\n', '\014', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', +'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', +'a', 'm', 'e', '\022', '0', '\n', '\024', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', +'m', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\022', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'N', +'a', 'm', 'e', '\022', 'q', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', +'s', 't', 'a', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', +'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\025', 'u', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', '4', '\n', '\026', 't', 'o', 't', +'a', 'l', '_', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\003', ' ', '\001', '(', '\004', +'R', '\024', 't', 'o', 't', 'a', 'l', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'a', '\n', +'\020', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '6', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', +'.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', +'e', 's', 't', 's', 'R', '\017', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'K', '\n', '\024', +'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\004', ' ', '\001', '(', +'\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', +'i', 'o', 'n', 'R', '\022', 'l', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\032', '\226', +'\001', '\n', '\017', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '#', '\n', '\010', 'c', 'a', 't', +'e', 'g', 'o', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\010', 'c', 'a', 't', +'e', 'g', 'o', 'r', 'y', '\022', '#', '\n', '\r', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'c', 'o', 'u', 'n', 't', '\030', '\002', ' ', +'\001', '(', '\004', 'R', '\014', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'C', 'o', 'u', 'n', 't', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', +'2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', +'s', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'B', '\217', '\001', '\n', '&', 'i', +'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\017', 'L', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'P', +'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', ';', 'e', 'n', 'd', +'p', 'o', 'i', 'n', 't', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[8] = { +static _upb_DefPool_Init *deps[9] = { &envoy_config_core_v3_address_proto_upbdefinit, &envoy_config_core_v3_base_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, + &xds_annotations_v3_status_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -131,5 +160,5 @@ _upb_DefPool_Init envoy_config_endpoint_v3_load_report_proto_upbdefinit = { deps, &envoy_config_endpoint_v3_load_report_proto_upb_file_layout, "envoy/config/endpoint/v3/load_report.proto", - UPB_STRINGVIEW_INIT(descriptor, 2428) + UPB_STRINGVIEW_INIT(descriptor, 3123) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h index 5e8cbfd3a0..f26c2d0ee1 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h @@ -33,6 +33,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_EndpointLoadMetricStat return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.EndpointLoadMetricStats"); } +UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_endpoint_v3_load_report_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats"); +} + UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterStats_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_endpoint_v3_load_report_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.ClusterStats"); diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c index ac79c46139..809842efb0 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c @@ -27,7 +27,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4281] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', +static const char descriptor[4337] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', 'c', 'e', 's', @@ -66,7 +66,7 @@ static const char descriptor[4281] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', '\"', 'L', '\n', '\022', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', -'i', 'e', 's', '\"', '\206', '\030', '\n', '\010', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'i', 'e', 's', '\"', '\276', '\030', '\n', '\010', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', '^', '\n', '\024', 'a', 'd', 'd', @@ -163,42 +163,44 @@ static const char descriptor[4281] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 't', 'e', 'n', 'e', 'r', '\022', '!', '\n', '\014', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'm', 'p', 't', 'c', 'p', '\030', '\036', ' ', '\001', '(', '\010', 'R', '\013', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'p', 't', 'c', 'p', '\022', '7', '\n', '\030', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', 'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', '\037', ' ', '\001', '(', '\010', 'R', -'\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', 't', '\032', 'w', '\n', -'\014', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\022', '<', '\n', '\014', 'b', 'i', 'n', 'd', '_', 't', 'o', '_', -'p', 'o', 'r', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\n', 'b', 'i', 'n', 'd', 'T', 'o', 'P', 'o', 'r', 't', -':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', -'t', 'e', 'n', 'e', 'r', '.', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\032', '\374', '\002', '\n', '\027', 'C', 'o', -'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\r', -'e', 'x', 'a', 'c', 't', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', -'t', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', -'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'H', '\000', 'R', '\014', 'e', 'x', 'a', 'c', -'t', 'B', 'a', 'l', 'a', 'n', 'c', 'e', '\022', 'S', '\n', '\016', 'e', 'x', 't', 'e', 'n', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', -'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', -'g', 'H', '\000', 'R', '\r', 'e', 'x', 't', 'e', 'n', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', '\032', 'Q', '\n', '\014', 'E', 'x', 'a', -'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', -'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', -'o', 'n', 'f', 'i', 'g', 'B', '\023', '\n', '\014', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', -'\001', '\032', '\030', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', -'i', 'g', '\"', ')', '\n', '\t', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', -'T', '\020', '\000', '\022', '\017', '\n', '\013', 'M', 'O', 'D', 'I', 'F', 'Y', '_', 'O', 'N', 'L', 'Y', '\020', '\001', ':', '\034', '\232', '\305', '\210', -'\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', -'B', '\024', '\n', '\022', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', -'\016', '\020', '\017', 'J', '\004', '\010', '\027', '\020', '\030', '\"', '\021', '\n', '\017', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', 'a', -'g', 'e', 'r', '\"', '\033', '\n', '\031', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\024', '\n', '\022', 'A', 'p', 'i', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', -'a', 'g', 'e', 'r', 'B', '\215', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\r', 'L', -'i', 's', 't', 'e', 'n', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', -'m', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', -'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', -'r', '/', 'v', '3', ';', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', -'p', 'r', 'o', 't', 'o', '3', +'\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', 't', '\022', '6', '\n', +'\027', 'b', 'y', 'p', 'a', 's', 's', '_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', +'#', ' ', '\001', '(', '\010', 'R', '\025', 'b', 'y', 'p', 'a', 's', 's', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', +'g', 'e', 'r', '\032', 'w', '\n', '\014', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\022', '<', '\n', '\014', 'b', 'i', +'n', 'd', '_', 't', 'o', '_', 'p', 'o', 'r', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\n', 'b', 'i', 'n', 'd', +'T', 'o', 'P', 'o', 'r', 't', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\032', +'\374', '\002', '\n', '\027', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', +'i', 'g', '\022', 'n', '\n', '\r', 'e', 'x', 'a', 'c', 't', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', +'2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', +'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', +'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'H', '\000', +'R', '\014', 'e', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', '\022', 'S', '\n', '\016', 'e', 'x', 't', 'e', 'n', 'd', '_', +'b', 'a', 'l', 'a', 'n', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\r', 'e', 'x', 't', 'e', 'n', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', '\032', +'Q', '\n', '\014', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', +'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', +'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\023', '\n', '\014', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 't', 'y', +'p', 'e', '\022', '\003', '\370', 'B', '\001', '\032', '\030', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'i', 's', 't', 'e', 'n', +'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\"', ')', '\n', '\t', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', '\022', '\013', '\n', '\007', +'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\017', '\n', '\013', 'M', 'O', 'D', 'I', 'F', 'Y', '_', 'O', 'N', 'L', 'Y', '\020', +'\001', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', +'s', 't', 'e', 'n', 'e', 'r', 'B', '\024', '\n', '\022', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', +'i', 'e', 'r', 'J', '\004', '\010', '\016', '\020', '\017', 'J', '\004', '\010', '\027', '\020', '\030', '\"', '\021', '\n', '\017', 'L', 'i', 's', 't', 'e', 'n', +'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\033', '\n', '\031', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'L', 'i', +'s', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\024', '\n', '\022', 'A', 'p', 'i', 'L', 'i', 's', 't', 'e', +'n', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\215', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', +'.', 'v', '3', 'B', '\r', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', +'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', +'t', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', +'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', ';', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', +'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[19] = { @@ -227,5 +229,5 @@ _upb_DefPool_Init envoy_config_listener_v3_listener_proto_upbdefinit = { deps, &envoy_config_listener_v3_listener_proto_upb_file_layout, "envoy/config/listener/v3/listener.proto", - UPB_STRINGVIEW_INIT(descriptor, 4281) + UPB_STRINGVIEW_INIT(descriptor, 4337) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c index a3d587f4e0..70dc8a2a80 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c @@ -18,7 +18,7 @@ extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[1455] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', +static const char descriptor[1665] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'q', 'u', 'i', 'c', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', @@ -32,7 +32,7 @@ static const char descriptor[1455] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', ' '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', -'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\244', '\007', '\n', '\023', 'Q', 'u', 'i', 'c', +'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\366', '\010', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\025', 'q', 'u', 'i', 'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'Q', 'u', 'i', 'c', 'P', @@ -68,15 +68,23 @@ static const char descriptor[1455] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', ' '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\034', 's', 'e', 'r', 'v', 'e', 'r', 'P', 'r', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', -'g', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', -'s', 'B', '\217', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\017', 'Q', 'u', 'i', 'c', -'C', 'o', 'n', 'f', 'i', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', -'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', -'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', -'/', 'v', '3', ';', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'g', '\022', ']', '\n', '\035', 's', 'e', 'n', 'd', '_', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', +'m', 'i', 'g', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\n', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\032', 's', 'e', 'n', 'd', 'D', +'i', 's', 'a', 'b', 'l', 'e', 'A', 'c', 't', 'i', 'v', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'q', '\n', '\037', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'e', 'b', 'u', 'g', '_', 'v', 'i', 's', 'i', 't', 'o', 'r', '_', +'c', 'o', 'n', 'f', 'i', 'g', '\030', '\013', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'C', 'o', 'n', 'f', 'i', 'g', 'R', '\034', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'b', 'u', 'g', 'V', 'i', +'s', 'i', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\217', '\001', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', +'r', '.', 'v', '3', 'B', '\017', 'Q', 'u', 'i', 'c', 'C', 'o', 'n', 'f', 'i', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', +'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', +'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', +'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', ';', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'v', '3', '\272', +'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[10] = { @@ -96,5 +104,5 @@ _upb_DefPool_Init envoy_config_listener_v3_quic_config_proto_upbdefinit = { deps, &envoy_config_listener_v3_quic_config_proto_upb_file_layout, "envoy/config/listener/v3/quic_config.proto", - UPB_STRINGVIEW_INIT(descriptor, 1455) + UPB_STRINGVIEW_INIT(descriptor, 1665) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c index 863f58c3f9..c746e84817 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c @@ -24,7 +24,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', +static const char descriptor[4302] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', @@ -98,7 +98,7 @@ static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 'e', 'd', 'E', 'x', 'p', 'r', 'B', '\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\020', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\332', '\007', '\n', '\n', 'P', 'e', 'r', 'm', 'i', +'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\253', '\010', '\n', '\n', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '\022', 'C', '\n', '\t', 'a', 'n', 'd', '_', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'R', 'u', 'l', 'e', 's', '\022', @@ -131,68 +131,72 @@ static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 'e', 'd', 'S', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'F', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', -'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\032', 's', '\n', '\003', 'S', 'e', 't', '\022', '@', '\n', '\005', 'r', 'u', 'l', 'e', 's', -'\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', -'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', -'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', -'t', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', -'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', -'\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', '>', '\n', '\007', 'a', 'n', 'd', -'_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', -'\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', -'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', '\022', '\033', '\n', '\003', 'a', 'n', -'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', 'U', -'\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '-', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', -'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', '\000', 'R', '\r', 'a', 'u', 't', -'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\005', -' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', -'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', -'m', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\016', -'d', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', 'e', 'm', 'o', 't', 'e', '_', -'i', 'p', '\030', '\013', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\010', 'r', 'e', 'm', 'o', 't', -'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', -'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', -'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', -'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', -'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\001', '(', '\013', -'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', -'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', '2', -')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'F', -'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', -'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', ' ', '\001', '(', '\013', '2', '\037', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', -'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', 'S', 'e', 't', '\022', ';', '\n', -'\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', -'\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', -'t', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\016', 'p', 'r', -'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', -'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', -'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', 'm', 'e', ':', '3', '\232', '\305', -'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', -'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'J', -'\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\021', '\n', '\n', 'i', 'd', -'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', -'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', -'m', 'e', '\022', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', -'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '}', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', -'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', -'\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', -'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', -'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', -'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'O', '\n', '\014', 'u', 'r', 'i', '_', 't', 'e', 'm', 'p', 'l', 'a', 't', 'e', +'\030', '\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', +'H', '\000', 'R', '\013', 'u', 'r', 'i', 'T', 'e', 'm', 'p', 'l', 'a', 't', 'e', '\032', 's', '\n', '\003', 'S', 'e', 't', '\022', '@', '\n', +'\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', +'\005', '\222', '\001', '\002', '\010', '\001', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', +'i', 'o', 'n', '.', 'S', 'e', 't', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', +'\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', +'>', '\n', '\007', 'a', 'n', 'd', '_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', +'S', 'e', 't', 'H', '\000', 'R', '\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', +' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', +'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', +'\022', '\033', '\n', '\003', 'a', 'n', 'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', +'\003', 'a', 'n', 'y', '\022', 'U', '\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', +'(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', +'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', +'\000', 'R', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', +'e', '_', 'i', 'p', '\030', '\005', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', +'e', 'c', 't', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', +'g', 'e', 'H', '\000', 'R', '\016', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', +'e', 'm', 'o', 't', 'e', '_', 'i', 'p', '\030', '\013', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', +'\010', 'r', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', +'2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', +'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', +'\n', '\010', 'u', 'r', 'l', '_', 'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', +'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', +'e', 'r', 'H', '\000', 'R', '\007', 'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', +'\030', '\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', +'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', +'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', +'\014', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', +'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', +'R', '\013', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', +' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', +'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', +'S', 'e', 't', '\022', ';', '\n', '\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', +'\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', +'p', 'a', 'l', '.', 'S', 'e', 't', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', +'\022', 'K', '\n', '\016', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', +'$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', +'t', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', +'m', 'e', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', +'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', +'c', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', +'B', '\021', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', 'A', 'c', +'t', 'i', 'o', 'n', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', +'\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', +'!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', +'A', 'C', '.', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '}', '\n', '\"', 'i', 'o', '.', 'e', +'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', +'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', +'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', +'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', +'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', +'o', '3', }; static _upb_DefPool_Init *deps[16] = { @@ -218,5 +222,5 @@ _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit = { deps, &envoy_config_rbac_v3_rbac_proto_upb_file_layout, "envoy/config/rbac/v3/rbac.proto", - UPB_STRINGVIEW_INIT(descriptor, 4221) + UPB_STRINGVIEW_INIT(descriptor, 4302) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c index ba5da3f332..ad069c6320 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c @@ -29,7 +29,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', +static const char descriptor[23186] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', @@ -317,7 +317,7 @@ static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'a', 't', 'c', 'h', 'e', 'r', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'B', '\025', '\n', '\016', 'p', 'a', 't', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', -'\010', '\003', '\020', '\004', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\305', '\005', '\n', '\n', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', +'\010', '\003', '\020', '\004', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\250', '\006', '\n', '\n', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '_', '\n', '\031', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', @@ -341,615 +341,622 @@ static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 't', 'e', '_', 'n', 'e', 't', 'w', 'o', 'r', 'k', '_', 'a', 'c', 'c', 'e', 's', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\031', 'a', 'l', 'l', 'o', 'w', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'N', 'e', 't', 'w', 'o', 'r', 'k', 'A', 'c', 'c', -'e', 's', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'r', 'o', 'u', 't', 'e', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\023', '\n', '\021', 'e', 'n', 'a', 'b', 'l', -'e', 'd', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\010', '\020', '\t', 'J', -'\004', '\010', '\007', '\020', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', 'R', '\022', 'a', 'l', 'l', 'o', -'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'r', 'e', 'g', 'e', 'x', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\"', '\334', -',', '\n', '\013', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', -'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', -'r', '\022', '6', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\t', -'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'H', '\000', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', -'r', 'H', 'e', 'a', 'd', 'e', 'r', '\022', 'U', '\n', '\021', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'c', 'l', 'u', 's', 't', -'e', 'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', -'\000', 'R', '\020', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', ':', '\n', '\030', 'c', 'l', -'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '%', ' ', -'\001', '(', '\t', 'H', '\000', 'R', '\026', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', -'u', 'g', 'i', 'n', '\022', 'v', '\n', '\037', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', -'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\'', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', -'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\034', 'i', 'n', 'l', 'i', -'n', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', '\022', -'\216', '\001', '\n', '\037', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '_', 'r', 'e', 's', -'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\024', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', -'o', 'n', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', -'e', 'C', 'o', 'd', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\033', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', -'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', 'E', '\n', '\016', 'm', 'e', -'t', 'a', 'd', 'a', 't', 'a', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', -'R', '\r', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', -'_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', -'\001', '\000', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', -'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', ' ', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', -'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', -'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', -'t', 'e', '\022', 'Z', '\n', '\023', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', -'\030', ')', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', -'R', '\021', 'p', 'a', 't', 'h', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '?', '\n', '\024', 'h', 'o', -'s', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', -'\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\022', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', -'t', 'e', 'L', 'i', 't', 'e', 'r', 'a', 'l', '\022', 'H', '\n', '\021', 'a', 'u', 't', 'o', '_', 'h', 'o', 's', 't', '_', 'r', 'e', -'w', 'r', 'i', 't', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\001', 'R', '\017', 'a', 'u', 't', 'o', 'H', 'o', 's', -'t', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', '=', '\n', '\023', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', -'h', 'e', 'a', 'd', 'e', 'r', '\030', '\035', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', -'H', '\001', 'R', '\021', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '\022', 'g', '\n', '\027', -'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'a', 't', 'h', '_', 'r', 'e', 'g', 'e', 'x', '\030', '#', -' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', -'.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', -'t', 'e', 'H', '\001', 'R', '\024', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'a', 't', 'h', 'R', 'e', 'g', 'e', -'x', '\022', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'h', -'o', 's', 't', '\030', '&', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', 'a', 'r', 'd', -'e', 'd', 'H', 'o', 's', 't', '\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', -'\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\n', '\021', -'e', 'a', 'r', 'l', 'y', '_', 'd', 'a', 't', 'a', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '(', ' ', '\001', '(', '\013', '2', '*', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', -'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 'e', 'a', 'r', 'l', 'y', 'D', -'a', 't', 'a', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'E', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', -'\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', -'t', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', -'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '_', 't', 'y', 'p', -'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '!', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\026', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', -'T', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', -'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\036', ' ', '\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', -'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', -'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'K', -'\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\013', ' ', '\001', '(', '\016', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', -'o', 'r', 'i', 't', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', -'\022', 'A', '\n', '\013', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', -'L', 'i', 'm', 'i', 't', 'R', '\n', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', '\\', '\n', '\026', 'i', 'n', 'c', 'l', -'u', 'd', 'e', '_', 'v', 'h', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', -'\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', -'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'i', 'n', 'c', 'l', 'u', 'd', 'e', 'V', -'h', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'N', '\n', '\013', 'h', 'a', 's', 'h', '_', 'p', 'o', 'l', 'i', 'c', -'y', '\030', '\017', ' ', '\003', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', -'l', 'i', 'c', 'y', 'R', '\n', 'h', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'B', '\n', '\004', 'c', 'o', 'r', 's', '\030', -'\021', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', -'e', '.', 'v', '3', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', -'3', '.', '0', 'R', '\004', 'c', 'o', 'r', 's', '\022', 'P', '\n', '\020', 'm', 'a', 'x', '_', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', -'e', 'o', 'u', 't', '\030', '\027', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', -'R', '\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\n', '\023', 'g', 'r', 'p', 'c', '_', -'t', 'i', 'm', 'e', 'o', 'u', 't', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', -'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\013', '\030', -'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\021', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'O', 'f', -'f', 's', 'e', 't', '\022', 'Y', '\n', '\017', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\031', -' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', -'.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', -'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'g', '\n', '\030', 'i', -'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\"', -' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', -'.', 'v', '3', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', -'y', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', -'\022', '\200', '\001', '\n', '\030', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'a', 'c', -'t', 'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'I', 'n', 't', -'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', -'\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', -'A', 'c', 't', 'i', 'o', 'n', '\022', '_', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', -'d', 'i', 'r', 'e', 'c', 't', 's', '\030', '\037', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', -'\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', -'c', 't', 's', '\022', 'E', '\n', '\014', 'h', 'e', 'd', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\033', ' ', '\001', '(', '\013', -'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', -'d', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '$', ' ', -'\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', -'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', -'n', '\032', '\201', '\003', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', -'\022', '3', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\031', '\362', '\230', '\376', '\217', '\005', '\023', -'\022', '\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\007', 'c', 'l', 'u', 's', -'t', 'e', 'r', '\022', 'K', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\005', ' ', '\001', -'(', '\t', 'B', '$', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\023', '\022', '\021', 'c', 'l', -'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', 'H', -'e', 'a', 'd', 'e', 'r', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', 'c', 't', 'i', 'o', 'n', -'\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', -'c', 'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\022', '?', '\n', '\r', -'t', 'r', 'a', 'c', 'e', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 't', -'r', 'a', 'c', 'e', 'S', 'a', 'm', 'p', 'l', 'e', 'd', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', '\002', '\020', -'\003', 'R', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\032', '\326', '\013', '\n', '\n', 'H', 'a', 's', 'h', 'P', 'o', -'l', 'i', 'c', 'y', '\022', 'N', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', -'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'H', -'\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', 'N', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', '\002', ' ', '\001', '(', '\013', -'2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', -'o', 'k', 'i', 'e', 'H', '\000', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\022', 'y', '\n', '\025', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 'B', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', -'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'H', '\000', 'R', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'g', '\n', '\017', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', -'a', 'm', 'e', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'e', 's', 's', '\022', 'a', '\n', '\037', 'f', 'o', 'r', 'w', 'a', 'r', 'd', '_', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'i', +'n', 'g', '_', 'p', 'r', 'e', 'f', 'l', 'i', 'g', 'h', 't', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\034', 'f', +'o', 'r', 'w', 'a', 'r', 'd', 'N', 'o', 't', 'M', 'a', 't', 'c', 'h', 'i', 'n', 'g', 'P', 'r', 'e', 'f', 'l', 'i', 'g', 'h', +'t', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', +'o', 'u', 't', 'e', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\023', '\n', '\021', 'e', 'n', 'a', 'b', 'l', 'e', +'d', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', +'\010', '\007', '\020', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', 'R', '\022', 'a', 'l', 'l', 'o', 'w', +'_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'r', 'e', 'g', 'e', 'x', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\"', '\246', '-', +'\n', '\013', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', +'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', +'\022', '6', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'B', +'\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'H', '\000', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', +'H', 'e', 'a', 'd', 'e', 'r', '\022', 'U', '\n', '\021', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', +'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', +'R', '\020', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', ':', '\n', '\030', 'c', 'l', 'u', +'s', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '%', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\026', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', +'g', 'i', 'n', '\022', 'v', '\n', '\037', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', +'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\'', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\034', 'i', 'n', 'l', 'i', 'n', +'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', '\022', '\216', +'\001', '\n', '\037', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '_', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\024', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', +'n', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', +'C', 'o', 'd', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\033', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', +'t', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', 'E', '\n', '\016', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', +'\r', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', '_', +'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', +'\000', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', +'_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', ' ', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', +'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', +'e', '\022', 'Z', '\n', '\023', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +')', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', +'\021', 'p', 'a', 't', 'h', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '?', '\n', '\024', 'h', 'o', 's', +'t', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\013', +'\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\022', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', +'e', 'L', 'i', 't', 'e', 'r', 'a', 'l', '\022', 'H', '\n', '\021', 'a', 'u', 't', 'o', '_', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', +'r', 'i', 't', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\001', 'R', '\017', 'a', 'u', 't', 'o', 'H', 'o', 's', 't', +'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', '=', '\n', '\023', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', '\030', '\035', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'H', +'\001', 'R', '\021', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '\022', 'g', '\n', '\027', 'h', +'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'a', 't', 'h', '_', 'r', 'e', 'g', 'e', 'x', '\030', '#', ' ', +'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', +'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', +'e', 'H', '\001', 'R', '\024', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'a', 't', 'h', 'R', 'e', 'g', 'e', 'x', +'\022', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'h', 'o', +'s', 't', '\030', '&', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'e', +'d', 'H', 'o', 's', 't', '\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', +'\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', +'\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', +'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\n', '\021', 'e', +'a', 'r', 'l', 'y', '_', 'd', 'a', 't', 'a', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '(', ' ', '\001', '(', '\013', '2', '*', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', +'d', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 'e', 'a', 'r', 'l', 'y', 'D', 'a', +'t', 'a', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'E', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +'\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', +'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '_', 't', 'y', 'p', 'e', +'d', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '!', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\026', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'T', +'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', +'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\036', ' ', '\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'R', +'\025', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'K', '\n', +'\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\013', ' ', '\001', '(', '\016', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', 'o', +'r', 'i', 't', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', +'A', '\n', '\013', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', +'i', 'm', 'i', 't', 'R', '\n', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', '\\', '\n', '\026', 'i', 'n', 'c', 'l', 'u', +'d', 'e', '_', 'v', 'h', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', +'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'i', 'n', 'c', 'l', 'u', 'd', 'e', 'V', 'h', +'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'N', '\n', '\013', 'h', 'a', 's', 'h', '_', 'p', 'o', 'l', 'i', 'c', 'y', +'\030', '\017', ' ', '\003', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', +'t', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', +'i', 'c', 'y', 'R', '\n', 'h', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'B', '\n', '\004', 'c', 'o', 'r', 's', '\030', '\021', +' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', +'.', 'v', '3', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', +'.', '0', 'R', '\004', 'c', 'o', 'r', 's', '\022', 'P', '\n', '\020', 'm', 'a', 'x', '_', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', +'o', 'u', 't', '\030', '\027', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', +'\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\n', '\023', 'g', 'r', 'p', 'c', '_', 't', +'i', 'm', 'e', 'o', 'u', 't', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', +'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\021', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'O', 'f', 'f', +'s', 'e', 't', '\022', 'Y', '\n', '\017', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\031', ' ', +'\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\016', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'g', '\n', '\030', 'i', 'n', +'t', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\"', ' ', +'\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', +'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'\200', '\001', '\n', '\030', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'a', 'c', 't', +'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'I', 'n', 't', 'e', +'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', +'c', 't', 'i', 'o', 'n', '\022', '_', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', +'i', 'r', 'e', 'c', 't', 's', '\030', '\037', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', +'t', 's', '\022', 'E', '\n', '\014', 'h', 'e', 'd', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\033', ' ', '\001', '(', '\013', '2', +'\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', +'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'd', +'\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '$', ' ', '\001', +'(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'\032', '\313', '\003', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'3', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\031', '\362', '\230', '\376', '\217', '\005', '\023', '\022', +'\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\007', 'c', 'l', 'u', 's', 't', +'e', 'r', '\022', 'K', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\005', ' ', '\001', '(', +'\t', 'B', '$', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\023', '\022', '\021', 'c', 'l', 'u', +'s', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', 'H', 'e', +'a', 'd', 'e', 'r', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\030', +'\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', +'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\022', '?', '\n', '\r', 't', +'r', 'a', 'c', 'e', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 't', 'r', +'a', 'c', 'e', 'S', 'a', 'm', 'p', 'l', 'e', 'd', '\022', 'H', '\n', '!', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 's', 'h', 'a', +'d', 'o', 'w', '_', 'h', 'o', 's', 't', '_', 's', 'u', 'f', 'f', 'i', 'x', '_', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\006', ' ', +'\001', '(', '\010', 'R', '\035', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'S', 'h', 'a', 'd', 'o', 'w', 'H', 'o', 's', 't', 'S', 'u', 'f', +'f', 'i', 'x', 'A', 'p', 'p', 'e', 'n', 'd', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', +'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', '\002', '\020', '\003', 'R', +'\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\032', '\326', '\013', '\n', '\n', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', +'c', 'y', '\022', 'N', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'H', '\000', 'R', +'\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', 'N', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '4', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', +'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', +'i', 'e', 'H', '\000', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\022', 'y', '\n', '\025', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 'B', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'H', '\000', 'R', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'g', '\n', '\017', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', +'e', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', +'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'H', '\000', 'R', +'\016', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '^', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', +'_', 's', 't', 'a', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', +'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'H', '\000', 'R', '\013', +'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\032', '\n', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', '\030', '\004', +' ', '\001', '(', '\010', 'R', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', '\032', '\306', '\001', '\n', '\006', 'H', 'e', 'a', 'd', 'e', 'r', +'\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', +'\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'S', +'\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '.', '.', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', +'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', 'g', 'e', +'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', +'s', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', '\032', '_', '\n', '\017', 'C', 'o', 'o', 'k', 'i', 'e', +'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', '\022', '%', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\021', +'\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '%', +'\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\017', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', '\001', '\300', +'\001', '\002', '\310', '\001', '\000', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\032', '\376', '\001', '\n', '\006', 'C', 'o', 'o', 'k', 'i', 'e', '\022', '\033', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', +'m', 'e', '\022', '+', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\003', 't', 't', 'l', '\022', '\022', '\n', +'\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', ']', '\n', '\n', 'a', 't', 't', 'r', +'i', 'b', 'u', 't', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', -'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'H', -'\000', 'R', '\016', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '^', '\n', '\014', 'f', 'i', 'l', 't', -'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'H', '\000', -'R', '\013', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\032', '\n', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', -'\030', '\004', ' ', '\001', '(', '\010', 'R', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', '\032', '\306', '\001', '\n', '\006', 'H', 'e', 'a', 'd', -'e', 'r', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', -'\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', -'\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '.', -'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', -'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', -'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', -'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', '\032', '_', '\n', '\017', 'C', 'o', 'o', 'k', -'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', '\022', '%', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', -'\022', '%', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\017', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', -'\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\032', '\376', '\001', '\n', '\006', 'C', 'o', 'o', 'k', 'i', 'e', +'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', +'R', '\n', 'a', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', +'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', '\032', 'z', '\n', '\024', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '\033', '\n', '\t', 's', 'o', 'u', +'r', 'c', 'e', '_', 'i', 'p', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', ':', 'E', '\232', +'\305', '\210', '\036', '@', '\n', '>', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', +'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\032', 'n', '\n', '\016', 'Q', 'u', 'e', +'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', +'m', 'e', 't', 'e', 'r', '\032', 'f', '\n', '\013', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\031', '\n', '\003', 'k', +'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', '<', '\232', +'\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', +'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', +'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', +'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\027', '\n', '\020', 'p', 'o', 'l', 'i', 'c', 'y', '_', 's', 'p', 'e', 'c', 'i', +'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\243', '\003', '\n', '\r', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '0', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', +'p', 'e', '\022', '4', '\n', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', +'n', 'a', 'b', 'l', 'e', 'd', '\022', 'e', '\n', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', +'\003', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', +'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\r', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\215', '\001', '\n', '\r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', +'i', 'g', '\022', ']', '\n', '\025', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'f', +'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'o', 'r', 'e', '.', 'v', '3', '.', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', +'g', 'R', '\023', 'p', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\035', '\n', +'\n', 'a', 'l', 'l', 'o', 'w', '_', 'p', 'o', 's', 't', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\t', 'a', 'l', 'l', 'o', 'w', 'P', +'o', 's', 't', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', +'C', 'o', 'n', 'f', 'i', 'g', '\032', '\210', '\002', '\n', '\021', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', +'i', 'o', 'n', '\022', 'I', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', +'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', +'i', 'o', 'n', '\022', 'P', '\n', '\027', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'h', 'e', 'a', 'd', 'e', +'r', '_', 'm', 'a', 'x', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\024', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', +'t', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'x', '\022', 'V', '\n', '\032', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', +'t', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\027', +'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'O', 'f', 'f', 's', 'e', 't', '\"', '`', +'\n', '\033', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', +'C', 'o', 'd', 'e', '\022', '\027', '\n', '\023', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', +'L', 'E', '\020', '\000', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\031', '\n', '\025', 'I', 'N', +'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'E', 'R', '_', 'E', 'R', 'R', 'O', 'R', '\020', '\002', '\"', '^', '\n', '\026', +'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\"', '\n', +'\036', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '_', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'R', 'E', +'D', 'I', 'R', 'E', 'C', 'T', '\020', '\000', '\022', '\034', '\n', '\030', 'H', 'A', 'N', 'D', 'L', 'E', '_', 'I', 'N', 'T', 'E', 'R', 'N', +'A', 'L', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\001', '\032', '\002', '\030', '\001', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', +'\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', +'A', 'c', 't', 'i', 'o', 'n', 'B', '\030', '\n', '\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', +'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\030', '\n', '\026', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', +'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\022', '\020', '\023', 'J', '\004', '\010', '\023', '\020', +'\024', 'J', '\004', '\010', '\020', '\020', '\021', 'J', '\004', '\010', '\026', '\020', '\027', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\n', '\020', '\013', +'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\"', '\277', +'\020', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', '_', 'o', +'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', 'r', 'y', 'O', 'n', '\022', 'R', '\n', '\013', 'n', 'u', 'm', '_', 'r', +'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', '\005', '\r', +'\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', +'\022', 'A', '\n', '\017', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\013', +'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', +'o', 'n', 'R', '\r', 'p', 'e', 'r', 'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'J', '\n', '\024', 'p', 'e', 'r', '_', +'t', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\r', ' ', '\001', '(', '\013', '2', '\031', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', +'\021', 'p', 'e', 'r', 'T', 'r', 'y', 'I', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'W', '\n', '\016', 'r', 'e', 't', +'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', +'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'R', '\r', 'r', 'e', 't', 'r', 'y', 'P', +'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'g', '\n', '\024', 'r', 'e', 't', 'r', 'y', '_', 'h', 'o', 's', 't', '_', 'p', 'r', 'e', +'d', 'i', 'c', 'a', 't', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', +'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\022', 'r', 'e', 't', 'r', 'y', 'H', +'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'd', '\n', '\030', 'r', 'e', 't', 'r', 'y', '_', 'o', 'p', 't', +'i', 'o', 'n', 's', '_', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\014', ' ', '\003', '(', '\013', '2', '*', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', +'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\026', 'r', 'e', 't', 'r', 'y', 'O', 'p', 't', +'i', 'o', 'n', 's', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\022', 'H', '\n', '!', 'h', 'o', 's', 't', '_', 's', 'e', +'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'r', 'e', 't', 'r', 'y', '_', 'm', 'a', 'x', '_', 'a', 't', 't', 'e', 'm', 'p', 't', +'s', '\030', '\006', ' ', '\001', '(', '\003', 'R', '\035', 'h', 'o', 's', 't', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', 'e', 't', +'r', 'y', 'M', 'a', 'x', 'A', 't', 't', 'e', 'm', 'p', 't', 's', '\022', '4', '\n', '\026', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', +'e', '_', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', 's', '\030', '\007', ' ', '\003', '(', '\r', 'R', '\024', 'r', 'e', 't', +'r', 'i', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 's', '\022', 'U', '\n', '\016', 'r', 'e', 't', 'r', +'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\010', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', 'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', +'k', 'O', 'f', 'f', '\022', 'x', '\n', '\033', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 'e', 'd', '_', 'r', 'e', 't', 'r', +'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\013', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', +'f', 'R', '\027', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', +'f', '\022', 'Q', '\n', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\t', ' ', +'\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\020', 'r', 'e', 't', 'r', 'i', 'a', 'b', +'l', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '`', '\n', '\031', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'r', 'e', +'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\n', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', +'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\027', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', +'H', 'e', 'a', 'd', 'e', 'r', 's', '\032', '\271', '\001', '\n', '\r', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', -'n', 'a', 'm', 'e', '\022', '+', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\003', 't', 't', 'l', '\022', -'\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', ']', '\n', '\n', 'a', 't', -'t', 'r', 'i', 'b', 'u', 't', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', -'t', 'e', 'R', '\n', 'a', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', -'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', '\032', 'z', '\n', '\024', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '\033', '\n', '\t', 's', -'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', ':', -'E', '\232', '\305', '\210', '\036', '@', '\n', '>', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', -'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\032', 'n', '\n', '\016', 'Q', -'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', -'8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', -'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', -'r', 'a', 'm', 'e', 't', 'e', 'r', '\032', 'f', '\n', '\013', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\031', '\n', -'\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', -'<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', -'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', -'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\027', '\n', '\020', 'p', 'o', 'l', 'i', 'c', 'y', '_', 's', 'p', 'e', -'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\243', '\003', '\n', '\r', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', -'n', 'f', 'i', 'g', '\022', '0', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', -'\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', -'T', 'y', 'p', 'e', '\022', '4', '\n', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', -'\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'e', '\n', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'c', 'o', 'n', 'f', 'i', -'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', -'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\r', 'c', 'o', -'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\215', '\001', '\n', '\r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', -'n', 'f', 'i', 'g', '\022', ']', '\n', '\025', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', -'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', -'f', 'i', 'g', 'R', '\023', 'p', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', '\022', -'\035', '\n', '\n', 'a', 'l', 'l', 'o', 'w', '_', 'p', 'o', 's', 't', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\t', 'a', 'l', 'l', 'o', -'w', 'P', 'o', 's', 't', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', -'d', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\210', '\002', '\n', '\021', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', -'a', 't', 'i', 'o', 'n', '\022', 'I', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', -'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', -'a', 't', 'i', 'o', 'n', '\022', 'P', '\n', '\027', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'h', 'e', 'a', -'d', 'e', 'r', '_', 'm', 'a', 'x', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\024', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', -'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'x', '\022', 'V', '\n', '\032', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', -'o', 'u', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'R', '\027', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'O', 'f', 'f', 's', 'e', 't', -'\"', '`', '\n', '\033', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'C', 'o', 'd', 'e', '\022', '\027', '\n', '\023', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', -'A', 'B', 'L', 'E', '\020', '\000', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\031', '\n', '\025', -'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'E', 'R', '_', 'E', 'R', 'R', 'O', 'R', '\020', '\002', '\"', '^', -'\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', -'\"', '\n', '\036', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '_', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', -'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\000', '\022', '\034', '\n', '\030', 'H', 'A', 'N', 'D', 'L', 'E', '_', 'I', 'N', 'T', 'E', -'R', 'N', 'A', 'L', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\001', '\032', '\002', '\030', '\001', ':', '%', '\232', '\305', '\210', '\036', -' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', -'t', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\030', '\n', '\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', -'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\030', '\n', '\026', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', -'_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\022', '\020', '\023', 'J', '\004', '\010', -'\023', '\020', '\024', 'J', '\004', '\010', '\020', '\020', '\021', 'J', '\004', '\010', '\026', '\020', '\027', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\n', -'\020', '\013', 'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'y', -'\"', '\277', '\020', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', -'_', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', 'r', 'y', 'O', 'n', '\022', 'R', '\n', '\013', 'n', 'u', 'm', -'_', 'r', 'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', -'\005', '\r', '\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', -'e', 's', '\022', 'A', '\n', '\017', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'R', '\r', 'p', 'e', 'r', 'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'J', '\n', '\024', 'p', 'e', -'r', '_', 't', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\r', ' ', '\001', '(', '\013', '2', -'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', -'n', 'R', '\021', 'p', 'e', 'r', 'T', 'r', 'y', 'I', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'W', '\n', '\016', 'r', -'e', 't', 'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', -'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'R', '\r', 'r', 'e', 't', 'r', -'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'g', '\n', '\024', 'r', 'e', 't', 'r', 'y', '_', 'h', 'o', 's', 't', '_', 'p', -'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', -'.', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\022', 'r', 'e', 't', 'r', -'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'd', '\n', '\030', 'r', 'e', 't', 'r', 'y', '_', 'o', -'p', 't', 'i', 'o', 'n', 's', '_', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\014', ' ', '\003', '(', '\013', '2', '*', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', -'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\026', 'r', 'e', 't', 'r', 'y', 'O', -'p', 't', 'i', 'o', 'n', 's', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\022', 'H', '\n', '!', 'h', 'o', 's', 't', '_', -'s', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'r', 'e', 't', 'r', 'y', '_', 'm', 'a', 'x', '_', 'a', 't', 't', 'e', 'm', -'p', 't', 's', '\030', '\006', ' ', '\001', '(', '\003', 'R', '\035', 'h', 'o', 's', 't', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', -'e', 't', 'r', 'y', 'M', 'a', 'x', 'A', 't', 't', 'e', 'm', 'p', 't', 's', '\022', '4', '\n', '\026', 'r', 'e', 't', 'r', 'i', 'a', -'b', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', 's', '\030', '\007', ' ', '\003', '(', '\r', 'R', '\024', 'r', -'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 's', '\022', 'U', '\n', '\016', 'r', 'e', -'t', 'r', 'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\010', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', -'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', 'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', -'a', 'c', 'k', 'O', 'f', 'f', '\022', 'x', '\n', '\033', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 'e', 'd', '_', 'r', 'e', -'t', 'r', 'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\013', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', -'l', 'i', 'c', 'y', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', -'O', 'f', 'f', 'R', '\027', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', -'O', 'f', 'f', '\022', 'Q', '\n', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', -'\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', -'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\020', 'r', 'e', 't', 'r', 'i', -'a', 'b', 'l', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '`', '\n', '\031', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', -'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\n', ' ', '\003', '(', '\013', '2', '$', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', -'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\027', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'R', 'e', 'q', 'u', 'e', -'s', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\032', '\271', '\001', '\n', '\r', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', -'t', 'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', -'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', -'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', -'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', -'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'B', '\r', '\n', '\013', 'c', 'o', 'n', -'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\303', '\001', -'\n', '\022', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', '\033', '\n', '\004', 'n', -'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', -'9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', -'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', +'\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', +'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', +'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\303', '\001', '\n', '\022', +'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', +'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', +'\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', +'C', 'o', 'n', 'f', 'i', 'g', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', +'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'t', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\326', '\001', '\n', '\014', 'R', 'e', +'t', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'J', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', +'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\014', 'b', +'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'F', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', +'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', +'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', -'t', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', -'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\326', '\001', '\n', '\014', -'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'J', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', -'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', -'\014', 'b', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'F', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', -'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', -'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', -'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\032', '\210', '\001', '\n', '\013', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', -'d', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', -'\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'V', '\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', -' ', '\001', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', -'.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', -'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', -'t', '\032', '\300', '\001', '\n', '\027', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', -'k', 'O', 'f', 'f', '\022', ']', '\n', '\r', 'r', 'e', 's', 'e', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', '\003', -'(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'t', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\032', '\210', '\001', '\n', '\013', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', +'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', +'\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'V', '\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', +'(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', -'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\014', 'r', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', -'F', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', -'\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\"', '4', '\n', '\021', -'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\013', '\n', '\007', 'S', 'E', 'C', 'O', -'N', 'D', 'S', '\020', '\000', '\022', '\022', '\n', '\016', 'U', 'N', 'I', 'X', '_', 'T', 'I', 'M', 'E', 'S', 'T', 'A', 'M', 'P', '\020', '\001', -':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', -'t', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\234', '\002', '\n', '\013', 'H', 'e', 'd', 'g', 'e', 'P', -'o', 'l', 'i', 'c', 'y', '\022', 'P', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', -'\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\017', 'i', 'n', 'i', -'t', 'i', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '\\', '\n', '\031', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', -'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'c', 'h', 'a', 'n', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', -'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', -'e', 'r', 'c', 'e', 'n', 't', 'R', '\027', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', -'C', 'h', 'a', 'n', 'c', 'e', '\022', '6', '\n', '\030', 'h', 'e', 'd', 'g', 'e', '_', 'o', 'n', '_', 'p', 'e', 'r', '_', 't', 'r', -'y', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\024', 'h', 'e', 'd', 'g', 'e', 'O', 'n', 'P', -'e', 'r', 'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', -'y', '\"', '\341', '\005', '\n', '\016', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\'', '\n', '\016', 'h', -'t', 't', 'p', 's', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\r', 'h', 't', -'t', 'p', 's', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', ')', '\n', '\017', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'd', -'i', 'r', 'e', 'c', 't', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\016', 's', 'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', -'r', 'e', 'c', 't', '\022', '0', '\n', '\r', 'h', 'o', 's', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\014', 'h', 'o', 's', 't', 'R', 'e', 'd', 'i', -'r', 'e', 'c', 't', '\022', '#', '\n', '\r', 'p', 'o', 'r', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\010', ' ', '\001', -'(', '\r', 'R', '\014', 'p', 'o', 'r', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '2', '\n', '\r', 'p', 'a', 't', 'h', '_', -'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', -'\001', '\000', 'H', '\001', 'R', '\014', 'p', 'a', 't', 'h', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '4', '\n', '\016', 'p', 'r', 'e', -'f', 'i', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', -'\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'U', '\n', -'\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', -'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', -'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'H', '\001', 'R', '\014', 'r', 'e', 'g', -'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'i', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', -'e', '\030', '\003', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'd', -'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', -'\020', '\001', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\037', '\n', '\013', 's', 't', 'r', 'i', 'p', -'_', 'q', 'u', 'e', 'r', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 's', 't', 'r', 'i', 'p', 'Q', 'u', 'e', 'r', 'y', '\"', -'w', '\n', '\024', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\025', -'\n', '\021', 'M', 'O', 'V', 'E', 'D', '_', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', 'L', 'Y', '\020', '\000', '\022', '\t', '\n', '\005', -'F', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'S', 'E', 'E', '_', 'O', 'T', 'H', 'E', 'R', '\020', '\002', '\022', '\026', '\n', -'\022', 'T', 'E', 'M', 'P', 'O', 'R', 'A', 'R', 'Y', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\003', '\022', '\026', '\n', '\022', -'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\004', ':', '(', '\232', '\305', '\210', -'\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', -'d', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\032', '\n', '\030', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', -'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '\030', '\n', '\026', 'p', 'a', 't', 'h', '_', 'r', -'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\"', '\241', '\001', '\n', '\024', 'D', 'i', 'r', 'e', -'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\006', 's', 't', 'a', 't', 'u', -'s', '\030', '\001', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'R', '\006', 's', 't', 'a', -'t', 'u', 's', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', -'e', 'R', '\004', 'b', 'o', 'd', 'y', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', -'c', 't', 'i', 'o', 'n', '\"', '\025', '\n', '\023', 'N', 'o', 'n', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'A', 'c', 't', -'i', 'o', 'n', '\"', '\221', '\001', '\n', '\t', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\022', '%', '\n', '\t', 'o', 'p', 'e', 'r', -'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 'o', 'p', 'e', -'r', 'a', 't', 'i', 'o', 'n', '\022', '8', '\n', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', -'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', -'l', 'u', 'e', 'R', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', -'r', '\"', '\322', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 'I', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', -'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', -'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', -'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'I', '\n', '\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', -'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', -'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', -'a', 'n', 'd', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'K', '\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', -'s', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', -'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', -'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', -'_', 't', 'a', 'g', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'t', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', -'t', 'o', 'm', 'T', 'a', 'g', 's', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\"', '\264', '\001', '\n', '\016', 'V', 'i', 'r', -'t', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', -'\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', -'\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', -'n', 'a', 'm', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'r', 'o', 'u', 't', 'e', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 'J', '\004', '\010', '\001', -'\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\007', 'p', 'a', 't', 't', 'e', 'r', 'n', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', -'\"', '\311', '\034', '\n', '\t', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', ';', '\n', '\005', 's', 't', 'a', 'g', 'e', '\030', '\001', +'F', 'o', 'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\032', +'\300', '\001', '\n', '\027', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', +'f', 'f', '\022', ']', '\n', '\r', 'r', 'e', 's', 'e', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', +'2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', +'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'B', '\010', +'\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\014', 'r', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'F', '\n', +'\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', +'\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\"', '4', '\n', '\021', 'R', 'e', +'s', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\013', '\n', '\007', 'S', 'E', 'C', 'O', 'N', 'D', +'S', '\020', '\000', '\022', '\022', '\n', '\016', 'U', 'N', 'I', 'X', '_', 'T', 'I', 'M', 'E', 'S', 'T', 'A', 'M', 'P', '\020', '\001', ':', '%', +'\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', +'.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\234', '\002', '\n', '\013', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', +'i', 'c', 'y', '\022', 'P', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', '\n', 'R', '\005', 's', 't', 'a', 'g', 'e', -'\022', '\037', '\n', '\013', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'd', 'i', -'s', 'a', 'b', 'l', 'e', 'K', 'e', 'y', '\022', 'K', '\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', -'2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', -'\001', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\022', '?', '\n', '\005', 'l', 'i', 'm', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', -'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'R', '\005', 'l', 'i', 'm', 'i', 't', -'\032', '\265', '\030', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '^', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'l', 'u', -'s', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', -'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', -'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'm', '\n', '\023', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'c', 'l', -'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', -'o', 'n', '.', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\022', -'d', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'a', '\n', '\017', 'r', 'e', 'q', -'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', -'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'H', -'\000', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '^', '\n', '\016', 'r', 'e', 'm', 'o', -'t', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', -'.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', 'R', '\r', -'r', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'U', '\n', '\013', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', -'k', 'e', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\017', 'i', 'n', 'i', 't', 'i', +'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '\\', '\n', '\031', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', '_', +'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'c', 'h', 'a', 'n', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', +'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', +'c', 'e', 'n', 't', 'R', '\027', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 'C', 'h', +'a', 'n', 'c', 'e', '\022', '6', '\n', '\030', 'h', 'e', 'd', 'g', 'e', '_', 'o', 'n', '_', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', +'t', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\024', 'h', 'e', 'd', 'g', 'e', 'O', 'n', 'P', 'e', 'r', +'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\"', +'\341', '\005', '\n', '\016', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\'', '\n', '\016', 'h', 't', 't', +'p', 's', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\r', 'h', 't', 't', 'p', +'s', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', ')', '\n', '\017', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'd', 'i', 'r', +'e', 'c', 't', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\016', 's', 'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', +'c', 't', '\022', '0', '\n', '\r', 'h', 'o', 's', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\014', 'h', 'o', 's', 't', 'R', 'e', 'd', 'i', 'r', 'e', +'c', 't', '\022', '#', '\n', '\r', 'p', 'o', 'r', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\010', ' ', '\001', '(', '\r', +'R', '\014', 'p', 'o', 'r', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '2', '\n', '\r', 'p', 'a', 't', 'h', '_', 'r', 'e', +'d', 'i', 'r', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', +'H', '\001', 'R', '\014', 'p', 'a', 't', 'h', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '4', '\n', '\016', 'p', 'r', 'e', 'f', 'i', +'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', +'\310', '\001', '\000', 'H', '\001', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'U', '\n', '\r', 'r', +'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', +'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', +'t', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'H', '\001', 'R', '\014', 'r', 'e', 'g', 'e', 'x', +'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'i', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', +'\003', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'd', 'i', 'r', +'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', +'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\037', '\n', '\013', 's', 't', 'r', 'i', 'p', '_', 'q', +'u', 'e', 'r', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 's', 't', 'r', 'i', 'p', 'Q', 'u', 'e', 'r', 'y', '\"', 'w', '\n', +'\024', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\025', '\n', '\021', +'M', 'O', 'V', 'E', 'D', '_', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', 'L', 'Y', '\020', '\000', '\022', '\t', '\n', '\005', 'F', 'O', +'U', 'N', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'S', 'E', 'E', '_', 'O', 'T', 'H', 'E', 'R', '\020', '\002', '\022', '\026', '\n', '\022', 'T', +'E', 'M', 'P', 'O', 'R', 'A', 'R', 'Y', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\003', '\022', '\026', '\n', '\022', 'P', 'E', +'R', 'M', 'A', 'N', 'E', 'N', 'T', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\004', ':', '(', '\232', '\305', '\210', '\036', '#', +'\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 'd', 'i', +'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\032', '\n', '\030', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'w', 'r', +'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '\030', '\n', '\026', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', +'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\"', '\241', '\001', '\n', '\024', 'D', 'i', 'r', 'e', 'c', 't', +'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\006', 's', 't', 'a', 't', 'u', 's', '\030', +'\001', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'R', '\006', 's', 't', 'a', 't', 'u', +'s', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', +'\004', 'b', 'o', 'd', 'y', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', +'i', 'o', 'n', '\"', '\025', '\n', '\023', 'N', 'o', 'n', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'A', 'c', 't', 'i', 'o', +'n', '\"', '\221', '\001', '\n', '\t', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\022', '%', '\n', '\t', 'o', 'p', 'e', 'r', 'a', 't', +'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 'o', 'p', 'e', 'r', 'a', +'t', 'i', 'o', 'n', '\022', '8', '\n', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', +'e', 'R', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\"', +'\322', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 'I', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 'a', 'm', +'p', 'l', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', +'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', +'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'I', '\n', '\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', 'a', 'm', +'p', 'l', 'i', 'n', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', +'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', +'d', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'K', '\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', +'m', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', +'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', +'a', 'g', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', 'r', +'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', 'o', +'m', 'T', 'a', 'g', 's', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\"', '\264', '\001', '\n', '\016', 'V', 'i', 'r', 't', 'u', +'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', +'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', +'.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', '\033', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', +'m', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', +'o', 'u', 't', 'e', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', +'J', '\004', '\010', '\003', '\020', '\004', 'R', '\007', 'p', 'a', 't', 't', 'e', 'r', 'n', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\"', '\311', +'\034', '\n', '\t', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', ';', '\n', '\005', 's', 't', 'a', 'g', 'e', '\030', '\001', ' ', '\001', +'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', '\n', 'R', '\005', 's', 't', 'a', 'g', 'e', '\022', '\037', +'\n', '\013', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'd', 'i', 's', 'a', +'b', 'l', 'e', 'K', 'e', 'y', '\022', 'K', '\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\'', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', +'t', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', +'\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\022', '?', '\n', '\005', 'l', 'i', 'm', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', ')', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', +'t', 'e', 'L', 'i', 'm', 'i', 't', '.', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'R', '\005', 'l', 'i', 'm', 'i', 't', '\032', '\265', +'\030', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '^', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', +'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', +'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', +'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'l', +'u', 's', 't', 'e', 'r', '\022', 'm', '\n', '\023', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'c', 'l', 'u', 's', +'t', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', 'H', '\000', 'R', '\n', 'g', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', -'\022', 'h', '\n', '\022', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', -'\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', -'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\020', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', -'e', 'M', 'a', 't', 'c', 'h', '\022', 'w', '\n', '\020', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '\030', '\007', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', -'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', -'.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\022', 'N', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\010', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', -'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'H', '\000', 'R', '\010', 'm', -'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'J', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', -'\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', -'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\t', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'q', '\n', '\025', 'm', 'a', 's', 'k', 'e', 'd', '_', 'r', 'e', 'm', 'o', 't', 'e', -'_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'.', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\022', 'd', 'e', +'s', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'a', '\n', '\017', 'r', 'e', 'q', 'u', 'e', +'s', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', +'.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'H', '\000', 'R', +'\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '^', '\n', '\016', 'r', 'e', 'm', 'o', 't', 'e', +'_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', -'c', 't', 'i', 'o', 'n', '.', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', -'H', '\000', 'R', '\023', 'm', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '\201', -'\001', '\n', '\033', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', -'m', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', -'o', 'n', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', -'c', 'h', 'H', '\000', 'R', '\030', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', -'M', 'a', 't', 'c', 'h', '\032', 'I', '\n', '\r', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '8', '\232', -'\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', -'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', -'u', 's', 't', 'e', 'r', '\032', 'S', '\n', '\022', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', -'e', 'r', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', -'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'e', 's', -'t', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', '\321', '\001', '\n', '\016', 'R', 'e', 'q', 'u', 'e', -'s', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', -'\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', -'d', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', -'o', 'r', 'K', 'e', 'y', '\022', '$', '\n', '\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\003', -' ', '\001', '(', '\010', 'R', '\014', 's', 'k', 'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', ':', '9', '\232', '\305', '\210', '\036', '4', -'\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', -'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', -'r', 's', '\032', 'I', '\n', '\r', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', ':', '8', '\232', '\305', '\210', '\036', -'3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', -'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', -'s', 's', '\032', '\276', '\001', '\n', '\023', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', -'s', '\022', 'R', '\n', '\022', 'v', '4', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', 'k', '_', 'l', 'e', 'n', '\030', '\001', +'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', 'R', '\r', 'r', 'e', +'m', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'U', '\n', '\013', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'k', 'e', +'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', +'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', +'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', 'H', '\000', 'R', '\n', 'g', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', 'h', +'\n', '\022', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', +'\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', +'.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', +'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\020', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', +'a', 't', 'c', 'h', '\022', 'w', '\n', '\020', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', +'\007', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', +'\270', '\356', '\362', '\322', '\005', '\001', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', +'\022', 'N', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\010', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', +'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'H', '\000', 'R', '\010', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', '\022', 'J', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', +'*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', +'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\t', 'e', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', '\022', 'q', '\n', '\025', 'm', 'a', 's', 'k', 'e', 'd', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', +'i', 'o', 'n', '.', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', +'R', '\023', 'm', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '\201', '\001', '\n', +'\033', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', +'t', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', +'.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', +'H', '\000', 'R', '\030', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', +'t', 'c', 'h', '\032', 'I', '\n', '\r', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '8', '\232', '\305', '\210', +'\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', +'t', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', +'t', 'e', 'r', '\032', 'S', '\n', '\022', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', +':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', +'t', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'e', 's', 't', 'i', +'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', '\321', '\001', '\n', '\016', 'R', 'e', 'q', 'u', 'e', 's', 't', +'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', +'\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', +'r', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\002', +' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', +'K', 'e', 'y', '\022', '$', '\n', '\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\003', ' ', '\001', +'(', '\010', 'R', '\014', 's', 'k', 'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', +'m', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', +'\032', 'I', '\n', '\r', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', +'1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', +'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', +'\032', '\276', '\001', '\n', '\023', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', +'R', '\n', '\022', 'v', '4', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', 'k', '_', 'l', 'e', 'n', '\030', '\001', ' ', '\001', +'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', ' ', 'R', '\017', 'v', '4', 'P', 'r', 'e', 'f', 'i', +'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\022', 'S', '\n', '\022', 'v', '6', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', +'k', '_', 'l', 'e', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', +'\001', 'R', '\017', 'v', '6', 'P', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\032', '\236', '\001', '\n', '\n', 'G', 'e', +'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', +'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', +'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', +'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', ':', +'5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', +'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', 'r', 'i', +'c', 'K', 'e', 'y', '\032', '\263', '\002', '\n', '\020', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', +'\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\001', '(', '\t', 'R', +'\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', +'t', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '=', '\n', '\014', 'e', 'x', 'p', 'e', 'c', +'t', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 'e', 'x', 'p', 'e', 'c', 't', 'M', +'a', 't', 'c', 'h', '\022', 'H', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '$', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', +'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\007', 'h', 'e', 'a', 'd', +'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'e', +'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\032', '\270', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', +'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', +'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', +'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\002', +' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', +'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', +'\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', +'_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', +'e', '\032', '\332', '\002', '\n', '\010', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', +'t', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', +'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', +'t', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', 'd', 'e', +'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', +'t', 'V', 'a', 'l', 'u', 'e', '\022', 'Y', '\n', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\004', ' ', '\001', '(', '\016', '2', '7', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', +'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '.', 'S', 'o', +'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\022', '$', '\n', +'\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', 's', 'k', +'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', '\"', '&', '\n', '\006', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '\013', '\n', '\007', 'D', +'Y', 'N', 'A', 'M', 'I', 'C', '\020', '\000', '\022', '\017', '\n', '\013', 'R', 'O', 'U', 'T', 'E', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\001', +'\032', '\227', '\002', '\n', '\030', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', +'a', 't', 'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', +'\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', +'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '=', '\n', '\014', 'e', +'x', 'p', 'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 'e', 'x', 'p', +'e', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', 'a', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', +'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', 'a', +'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', +'a', 'm', 'e', 't', 'e', 'r', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', +'n', 'B', '\027', '\n', '\020', 'a', 'c', 't', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', +'\001', '\032', '\362', '\001', '\n', '\010', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'f', '\n', '\020', 'd', 'y', 'n', 'a', 'm', 'i', 'c', +'_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', +'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'H', +'\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'c', '\n', '\017', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', +'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', +'t', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\031', '\n', '\022', 'o', 'v', +'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', ':', '#', '\232', '\305', +'\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', +'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\"', '\346', '\005', '\n', '\r', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', +'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', +'\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '.', '\n', '\013', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', 't', 'c', +'h', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\n', 'e', +'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', '\\', '\n', '\020', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '_', 'm', +'a', 't', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', +'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\013', '\030', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\016', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', 'M', 'a', +'t', 'c', 'h', '\022', '<', '\n', '\013', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\013', '2', +'\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', +'e', 'H', '\000', 'R', '\n', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\r', 'p', 'r', 'e', 's', 'e', 'n', +'t', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', 'p', 'r', 'e', 's', 'e', 'n', 't', 'M', +'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', '\001', '(', +'\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\013', +'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', 'a', 't', +'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', ';', '\n', '\016', 'c', 'o', 'n', +'t', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', 'M', +'a', 't', 'c', 'h', '\022', 'I', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\r', ' ', '\001', '(', +'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', +'.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', +'a', 't', 'c', 'h', '\022', '!', '\n', '\014', 'i', 'n', 'v', 'e', 'r', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', '\001', '(', +'\010', 'R', '\013', 'i', 'n', 'v', 'e', 'r', 't', 'M', 'a', 't', 'c', 'h', '\022', '@', '\n', '\035', 't', 'r', 'e', 'a', 't', '_', 'm', +'i', 's', 's', 'i', 'n', 'g', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 's', '_', 'e', 'm', 'p', 't', 'y', '\030', '\016', ' ', +'\001', '(', '\010', 'R', '\031', 't', 'r', 'e', 'a', 't', 'M', 'i', 's', 's', 'i', 'n', 'g', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 's', +'E', 'm', 'p', 't', 'y', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\030', '\n', '\026', +'h', 'e', 'a', 'd', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', +'\002', '\020', '\003', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\013', 'r', 'e', 'g', 'e', 'x', '_', 'm', 'a', +'t', 'c', 'h', '\"', '\241', '\002', '\n', '\025', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', 'a', 't', +'c', 'h', 'e', 'r', '\022', '\036', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', '\007', 'r', '\005', +'\020', '\001', '(', '\200', '\010', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'S', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', +'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', +'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\r', +'p', 'r', 'e', 's', 'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', 'p', 'r', +'e', 's', 'e', 'n', 't', 'M', 'a', 't', 'c', 'h', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', +'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '!', '\n', '\037', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', +'t', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\003', '\020', '\004', +'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\206', '\003', '\n', '\026', +'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'R', '\n', +'\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', ' ', 'R', '\017', 'v', '4', 'P', 'r', 'e', -'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\022', 'S', '\n', '\022', 'v', '6', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', -'a', 's', 'k', '_', 'l', 'e', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '*', '\003', -'\030', '\200', '\001', 'R', '\017', 'v', '6', 'P', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\032', '\236', '\001', '\n', '\n', -'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', -'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', -'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', -'r', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', -'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', -'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', -'r', 'i', 'c', 'K', 'e', 'y', '\032', '\263', '\002', '\n', '\020', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', -'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\001', '(', -'\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', -'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', -'\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '=', '\n', '\014', 'e', 'x', 'p', -'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 'e', 'x', 'p', 'e', 'c', -'t', 'M', 'a', 't', 'c', 'h', '\022', 'H', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '$', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\007', 'h', 'e', -'a', 'd', 'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', -'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\032', '\270', '\001', '\n', '\017', 'D', 'y', 'n', 'a', -'m', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', -'_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', -'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', -'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', '\005', '\212', '\001', -'\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', -'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', -'l', 'u', 'e', '\032', '\332', '\002', '\n', '\010', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', -'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', -'\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', -'d', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', -'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', 'Y', '\n', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\004', ' ', '\001', '(', '\016', '2', -'7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', -'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '.', -'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\022', -'$', '\n', '\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', -'s', 'k', 'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', '\"', '&', '\n', '\006', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '\013', '\n', -'\007', 'D', 'Y', 'N', 'A', 'M', 'I', 'C', '\020', '\000', '\022', '\017', '\n', '\013', 'R', 'O', 'U', 'T', 'E', '_', 'E', 'N', 'T', 'R', 'Y', -'\020', '\001', '\032', '\227', '\002', '\n', '\030', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', -'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', -'\004', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', -'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '=', '\n', -'\014', 'e', 'x', 'p', 'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 'e', -'x', 'p', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', 'a', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', -'e', 't', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', -'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', -'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', -'i', 'o', 'n', 'B', '\027', '\n', '\020', 'a', 'c', 't', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', -'\370', 'B', '\001', '\032', '\362', '\001', '\n', '\010', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'f', '\n', '\020', 'd', 'y', 'n', 'a', 'm', -'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', -'t', '.', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', -'a', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'c', '\n', '\017', 'D', -'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\031', '\n', '\022', -'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', ':', '#', -'\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', -'.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\"', '\346', '\005', '\n', '\r', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', -'h', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', -'\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '.', '\n', '\013', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', -'t', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', -'\n', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', '\\', '\n', '\020', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', -'_', 'm', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', -'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\016', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', -'M', 'a', 't', 'c', 'h', '\022', '<', '\n', '\013', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', -'\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', -'n', 'g', 'e', 'H', '\000', 'R', '\n', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\r', 'p', 'r', 'e', 's', -'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', 'p', 'r', 'e', 's', 'e', 'n', -'t', 'M', 'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', -'\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', -'R', '\013', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', -'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', ';', '\n', '\016', 'c', -'o', 'n', 't', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', -'s', 'M', 'a', 't', 'c', 'h', '\022', 'I', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\r', ' ', -'\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', -'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', -'g', 'M', 'a', 't', 'c', 'h', '\022', '!', '\n', '\014', 'i', 'n', 'v', 'e', 'r', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', -'\001', '(', '\010', 'R', '\013', 'i', 'n', 'v', 'e', 'r', 't', 'M', 'a', 't', 'c', 'h', '\022', '@', '\n', '\035', 't', 'r', 'e', 'a', 't', -'_', 'm', 'i', 's', 's', 'i', 'n', 'g', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 's', '_', 'e', 'm', 'p', 't', 'y', '\030', -'\016', ' ', '\001', '(', '\010', 'R', '\031', 't', 'r', 'e', 'a', 't', 'M', 'i', 's', 's', 'i', 'n', 'g', 'H', 'e', 'a', 'd', 'e', 'r', -'A', 's', 'E', 'm', 'p', 't', 'y', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\030', -'\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', -'\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\013', 'r', 'e', 'g', 'e', 'x', '_', -'m', 'a', 't', 'c', 'h', '\"', '\241', '\002', '\n', '\025', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', -'a', 't', 'c', 'h', 'e', 'r', '\022', '\036', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', '\007', -'r', '\005', '\020', '\001', '(', '\200', '\010', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'S', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', -'a', 't', 'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', -'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', '%', -'\n', '\r', 'p', 'r', 'e', 's', 'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', -'p', 'r', 'e', 's', 'e', 'n', 't', 'M', 'a', 't', 'c', 'h', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', -'e', 't', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '!', '\n', '\037', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\003', -'\020', '\004', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\206', '\003', -'\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', -'R', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', -'\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', -'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\022', '@', '\n', '\027', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', 'p', -'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', 's', '\030', '\002', ' ', '\003', '(', '\r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\020', -'\005', 'R', '\025', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 's', '\022', -'J', '\n', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', -'\022', '=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'o', 's', 's', '_', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', -'d', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'o', 's', 's', 'S', -'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', 'K', '\n', '\030', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', -'_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'c', 'o', 'p', 'y', '\030', '\005', ' ', '\003', '(', '\t', 'B', '\022', '\372', -'B', '\017', '\222', '\001', '\014', '\030', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\025', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'C', 'o', 'p', 'y', '\"', 'y', '\n', '\014', 'F', 'i', 'l', 't', 'e', 'r', -'C', 'o', 'n', 'f', 'i', 'g', '\022', ',', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 'c', 'o', 'n', 'f', -'i', 'g', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', -'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\022', '\032', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'B', '\213', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', -'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', -'.', 'v', '3', 'B', '\024', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', -'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', -'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', -'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', ';', 'r', 'o', 'u', 't', 'e', 'v', '3', '\272', '\200', '\310', -'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', +'i', 'r', 'e', 'c', 't', 's', '\022', '@', '\n', '\027', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', '_', 'c', 'o', 'd', 'e', 's', '\030', '\002', ' ', '\003', '(', '\r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\020', '\005', 'R', +'\025', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 's', '\022', 'J', '\n', +'\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\022', '=', +'\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'o', 's', 's', '_', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'd', 'i', +'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'o', 's', 's', 'S', 'c', 'h', +'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', 'K', '\n', '\030', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'c', 'o', 'p', 'y', '\030', '\005', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', +'\222', '\001', '\014', '\030', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', +'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'C', 'o', 'p', 'y', '\"', 'y', '\n', '\014', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', +'n', 'f', 'i', 'g', '\022', ',', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', +'\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'i', 's', +'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\022', '\032', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', +'\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'B', '\213', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', 'B', '\024', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', +'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', +'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', +'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', ';', 'r', 'o', 'u', 't', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[21] = { @@ -980,5 +987,5 @@ _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit = { deps, &envoy_config_route_v3_route_components_proto_upb_file_layout, "envoy/config/route/v3/route_components.proto", - UPB_STRINGVIEW_INIT(descriptor, 23013) + UPB_STRINGVIEW_INIT(descriptor, 23186) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c index dc1736c01e..75b33079d2 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c @@ -9,37 +9,47 @@ #include "envoy/config/trace/v3/datadog.upbdefs.h" #include "envoy/config/trace/v3/datadog.upb_minitable.h" +extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[580] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', +static const char descriptor[786] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', 'a', 't', 'a', 'd', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', -'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\314', '\001', '\n', '\r', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', +'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', +'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', +'/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '[', '\n', '\023', 'D', 'a', 't', 'a', 'd', 'o', +'g', 'R', 'e', 'm', 'o', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'D', '\n', '\020', 'p', 'o', 'l', 'l', 'i', 'n', 'g', '_', +'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 'p', 'o', 'l', 'l', 'i', 'n', 'g', +'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\"', '\235', '\002', '\n', '\r', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '*', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', '-', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', '\001', -'(', '\t', 'R', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', ':', '*', '\232', '\305', -'\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', -'2', '.', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\263', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', -'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', -'c', 'e', '.', 'v', '3', 'B', '\014', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', -'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', -'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', -'t', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '*', '\022', '(', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'd', -'a', 't', 'a', 'd', 'o', 'g', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'(', '\t', 'R', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', 'O', '\n', '\r', +'r', 'e', 'm', 'o', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'd', 'o', +'g', 'R', 'e', 'm', 'o', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'r', 'e', 'm', 'o', 't', 'e', 'C', 'o', 'n', 'f', +'i', 'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', +'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\263', '\001', '\n', +'#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', '\014', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'P', 'r', 'o', 't', 'o', +'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', +'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', +'\217', '\005', '*', '\022', '(', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', +'c', 'e', 'r', 's', '.', 'd', 'a', 't', 'a', 'd', 'o', 'g', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[5] = { +static _upb_DefPool_Init *deps[6] = { + &google_protobuf_duration_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -51,5 +61,5 @@ _upb_DefPool_Init envoy_config_trace_v3_datadog_proto_upbdefinit = { deps, &envoy_config_trace_v3_datadog_proto_upb_file_layout, "envoy/config/trace/v3/datadog.proto", - UPB_STRINGVIEW_INIT(descriptor, 580) + UPB_STRINGVIEW_INIT(descriptor, 786) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h index 4515edd1bb..5d8bc2f4d9 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h @@ -18,6 +18,11 @@ extern "C" { extern _upb_DefPool_Init envoy_config_trace_v3_datadog_proto_upbdefinit; +UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogRemoteConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_trace_v3_datadog_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.trace.v3.DatadogRemoteConfig"); +} + UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogConfig_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_trace_v3_datadog_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.trace.v3.DatadogConfig"); diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c index a7df08e9c3..7d1fb5c03b 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[622] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', +static const char descriptor[634] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', @@ -25,21 +25,22 @@ static const char descriptor[622] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', -'o', 't', 'o', '\"', '\253', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', ',', -'\n', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', -'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\022', '<', '\n', '\006', 'c', 'o', -'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\006', -'c', 'o', 'n', 'f', 'i', 'g', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', -'i', 'g', 'B', '\270', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', '\016', 'D', 'y', 'n', 'a', 'm', 'i', -'c', 'O', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', -'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', -'/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', -'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', 'v', -'4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'o', 't', 'o', '\"', '\267', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', +'\n', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\030', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', +'\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', +'\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', ':', ',', '\232', '\305', '\210', '\036', '\'', +'\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'D', +'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\270', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', +'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', +'e', '.', 'v', '3', 'B', '\016', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', +'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', +'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', +'/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', +'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', +'d', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -56,5 +57,5 @@ _upb_DefPool_Init envoy_config_trace_v3_dynamic_ot_proto_upbdefinit = { deps, &envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout, "envoy/config/trace/v3/dynamic_ot.proto", - UPB_STRINGVIEW_INIT(descriptor, 622) + UPB_STRINGVIEW_INIT(descriptor, 634) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c index 9787086585..d105d1ebb7 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[1702] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'o', +static const char descriptor[1780] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'o', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', @@ -26,64 +26,67 @@ static const char descriptor[1702] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', ' 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', -'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\302', '\t', '\n', '\020', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', -'C', 'o', 'n', 'f', 'i', 'g', '\022', 'V', '\n', '\014', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', +'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\220', '\n', '\n', '\020', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', +'C', 'o', 'n', 'f', 'i', 'g', '\022', '\\', '\n', '\014', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'o', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '.', 't', 'r', -'a', 'c', 'e', '.', 'v', '1', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\013', '\030', '\001', '\222', '\307', '\206', -'\330', '\004', '\003', '3', '.', '0', 'R', '\013', 't', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'C', '\n', '\027', 's', 't', -'d', 'o', 'u', 't', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\002', ' ', '\001', -'(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\025', 's', 't', 'd', 'o', 'u', 't', 'E', 'x', -'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'M', '\n', '\034', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', -'v', 'e', 'r', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', -'\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\032', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', -'e', 'r', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'A', '\n', '\026', 's', 't', 'a', 'c', -'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'p', 'r', 'o', 'j', 'e', 'c', 't', '_', 'i', 'd', '\030', '\004', ' ', '\001', '(', '\t', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', -'P', 'r', 'o', 'j', 'e', 'c', 't', 'I', 'd', '\022', '<', '\n', '\023', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', -'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', -'0', 'R', '\022', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'h', '\n', '\030', -'s', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', -'\r', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', -'3', '.', '0', 'R', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', -'c', 'e', '\022', 'C', '\n', '\027', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', -'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\025', -'z', 'i', 'p', 'k', 'i', 'n', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '*', '\n', '\n', -'z', 'i', 'p', 'k', 'i', 'n', '_', 'u', 'r', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', -'\003', '3', '.', '0', 'R', '\t', 'z', 'i', 'p', 'k', 'i', 'n', 'U', 'r', 'l', '\022', 'E', '\n', '\030', 'o', 'c', 'a', 'g', 'e', 'n', -'t', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\013', ' ', '\001', '(', '\010', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\026', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'E', 'x', 'p', 'o', -'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '4', '\n', '\017', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', 'a', 'd', -'d', 'r', 'e', 's', 's', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', -'\016', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '`', '\n', '\024', 'o', 'c', 'a', 'g', 'e', 'n', -'t', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', -'r', 'v', 'i', 'c', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\022', 'o', 'c', 'a', 'g', 'e', -'n', 't', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'w', '\n', '\026', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', -'_', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', -'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', 'T', 'r', 'a', -'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'w', '\n', '\026', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', '_', 't', 'r', 'a', -'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\t', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', -'s', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\013', '\030', '\001', '\222', -'\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', 'T', 'r', 'a', 'c', 'e', 'C', 'o', -'n', 't', 'e', 'x', 't', '\"', '`', '\n', '\014', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\010', '\n', '\004', -'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\001', -'\022', '\022', '\n', '\016', 'G', 'R', 'P', 'C', '_', 'T', 'R', 'A', 'C', 'E', '_', 'B', 'I', 'N', '\020', '\002', '\022', '\027', '\n', '\023', 'C', -'L', 'O', 'U', 'D', '_', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\003', '\022', '\006', '\n', '\002', 'B', -'3', '\020', '\004', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'t', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', -'J', '\004', '\010', '\007', '\020', '\010', 'B', '\271', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', '\017', 'O', 'p', -'e', 'n', 'c', 'e', 'n', 's', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', -'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', -'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', -'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'o', 'p', 'e', 'n', 'c', 'e', 'n', -'s', 'u', 's', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'a', 'c', 'e', '.', 'v', '1', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\021', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\013', 't', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', 'I', '\n', '\027', 's', 't', 'd', 'o', 'u', 't', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', +'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', +'\005', '\001', 'R', '\025', 's', 't', 'd', 'o', 'u', 't', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', +'\022', 'S', '\n', '\034', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', +'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', +'0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\032', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'E', 'x', 'p', 'o', 'r', +'t', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'G', '\n', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', +'_', 'p', 'r', 'o', 'j', 'e', 'c', 't', '_', 'i', 'd', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'P', +'r', 'o', 'j', 'e', 'c', 't', 'I', 'd', '\022', 'B', '\n', '\023', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', +'\270', '\356', '\362', '\322', '\005', '\001', 'R', '\022', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'A', 'd', 'd', 'r', 'e', 's', +'s', '\022', 'n', '\n', '\030', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', +'v', 'i', 'c', 'e', '\030', '\r', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', '\021', '\030', '\001', '\222', +'\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', +'e', 'r', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'I', '\n', '\027', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'e', +'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', +'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\025', 'z', 'i', 'p', 'k', 'i', 'n', 'E', 'x', +'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '0', '\n', '\n', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'u', +'r', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', +'\005', '\001', 'R', '\t', 'z', 'i', 'p', 'k', 'i', 'n', 'U', 'r', 'l', '\022', 'K', '\n', '\030', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', +'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\021', '\030', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\026', 'o', 'c', 'a', 'g', 'e', 'n', 't', +'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', ':', '\n', '\017', 'o', 'c', 'a', 'g', 'e', 'n', +'t', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\016', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', +'\022', 'f', '\n', '\024', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', +'\016', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\022', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'G', 'r', 'p', 'c', 'S', 'e', 'r', +'v', 'i', 'c', 'e', '\022', '}', '\n', '\026', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', '_', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', +'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', +'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', 'T', 'r', 'a', 'c', 'e', 'C', +'o', 'n', 't', 'e', 'x', 't', '\022', '}', '\n', '\026', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', '_', 't', 'r', 'a', 'c', 'e', '_', +'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\t', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', +'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', 'T', 'r', 'a', 'c', +'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\"', '`', '\n', '\014', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', +'\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', +'T', '\020', '\001', '\022', '\022', '\n', '\016', 'G', 'R', 'P', 'C', '_', 'T', 'R', 'A', 'C', 'E', '_', 'B', 'I', 'N', '\020', '\002', '\022', '\027', +'\n', '\023', 'C', 'L', 'O', 'U', 'D', '_', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\003', '\022', '\006', +'\n', '\002', 'B', '3', '\020', '\004', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', +'f', 'i', 'g', 'J', '\004', '\010', '\007', '\020', '\010', 'B', '\271', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', +'\017', 'O', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', +'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', +'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', +'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', +'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'o', 'p', 'e', 'n', +'c', 'e', 'n', 's', 'u', 's', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', +'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -100,5 +103,5 @@ _upb_DefPool_Init envoy_config_trace_v3_opencensus_proto_upbdefinit = { deps, &envoy_config_trace_v3_opencensus_proto_upb_file_layout, "envoy/config/trace/v3/opencensus.proto", - UPB_STRINGVIEW_INIT(descriptor, 1702) + UPB_STRINGVIEW_INIT(descriptor, 1780) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c index 61ad81a946..e1bd00556b 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'z', +static const char descriptor[1086] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'z', 'i', 'p', 'k', 'i', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', @@ -25,7 +25,7 @@ static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', -'o', '\"', '\367', '\004', '\n', '\014', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', +'o', '\"', '\204', '\005', '\n', '\014', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '6', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '\030', '\002', ' ', '\001', '(', '\t', @@ -41,23 +41,24 @@ static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\030', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '-', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', -'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\027', 's', 'p', 'l', 'i', 't', '_', -'s', 'p', 'a', 'n', 's', '_', 'f', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\024', -'s', 'p', 'l', 'i', 't', 'S', 'p', 'a', 'n', 's', 'F', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', '\"', 'x', '\n', '\030', 'C', -'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '3', -'\n', '%', 'D', 'E', 'P', 'R', 'E', 'C', 'A', 'T', 'E', 'D', '_', 'A', 'N', 'D', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', -'B', 'L', 'E', '_', 'D', 'O', '_', 'N', 'O', 'T', '_', 'U', 'S', 'E', '\020', '\000', '\032', '\010', '\010', '\001', '\250', '\367', '\264', '\213', '\002', -'\001', '\022', '\r', '\n', '\t', 'H', 'T', 'T', 'P', '_', 'J', 'S', 'O', 'N', '\020', '\001', '\022', '\016', '\n', '\n', 'H', 'T', 'T', 'P', '_', -'P', 'R', 'O', 'T', 'O', '\020', '\002', '\022', '\010', '\n', '\004', 'G', 'R', 'P', 'C', '\020', '\003', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', -'\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'Z', 'i', -'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\261', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', -'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', -'B', '\013', 'Z', 'i', 'p', 'k', 'i', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', -'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', -'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', -'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', ')', '\022', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'z', 'i', 'p', 'k', 'i', 'n', '.', -'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', 'B', '\n', '\027', 's', 'p', 'l', 'i', 't', '_', +'s', 'p', 'a', 'n', 's', '_', 'f', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\007', ' ', '\001', '(', '\010', 'B', '\013', +'\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 's', 'p', 'l', 'i', 't', 'S', 'p', 'a', 'n', 's', 'F', 'o', +'r', 'R', 'e', 'q', 'u', 'e', 's', 't', '\"', 'x', '\n', '\030', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', +'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '3', '\n', '%', 'D', 'E', 'P', 'R', 'E', 'C', 'A', 'T', 'E', 'D', +'_', 'A', 'N', 'D', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '_', 'D', 'O', '_', 'N', 'O', 'T', '_', 'U', +'S', 'E', '\020', '\000', '\032', '\010', '\010', '\001', '\250', '\367', '\264', '\213', '\002', '\001', '\022', '\r', '\n', '\t', 'H', 'T', 'T', 'P', '_', 'J', 'S', +'O', 'N', '\020', '\001', '\022', '\016', '\n', '\n', 'H', 'T', 'T', 'P', '_', 'P', 'R', 'O', 'T', 'O', '\020', '\002', '\022', '\010', '\n', '\004', 'G', +'R', 'P', 'C', '\020', '\003', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\261', +'\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', '\013', 'Z', 'i', 'p', 'k', 'i', 'n', 'P', 'r', 'o', 't', +'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', +'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', +'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', +'\376', '\217', '\005', ')', '\022', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'c', 'e', 'r', 's', '.', 'z', 'i', 'p', 'k', 'i', 'n', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -74,5 +75,5 @@ _upb_DefPool_Init envoy_config_trace_v3_zipkin_proto_upbdefinit = { deps, &envoy_config_trace_v3_zipkin_proto_upb_file_layout, "envoy/config/trace/v3/zipkin.proto", - UPB_STRINGVIEW_INIT(descriptor, 1073) + UPB_STRINGVIEW_INIT(descriptor, 1086) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c index 79783887b8..afb001724b 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', +static const char descriptor[9079] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', @@ -179,7 +179,7 @@ static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', -'C', 'o', 'm', 'm', 'o', 'n', '\"', '\351', '\r', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', +'C', 'o', 'm', 'm', 'o', 'n', '\"', '\241', '\016', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', '8', '\n', '\030', 'f', 'a', 'i', 'l', 'e', 'd', '_', 'l', 'o', 'c', 'a', 'l', '_', 'h', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 'c', 'k', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\026', 'f', 'a', 'i', 'l', 'e', 'd', 'L', 'o', 'c', 'a', 'l', 'H', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 'c', 'k', '\022', '.', '\n', '\023', 'n', 'o', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'u', 'p', 's', @@ -239,147 +239,150 @@ static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '4', '\n', '\026', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\024', 'd', 'n', 's', 'R', -'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\032', '\325', '\001', '\n', '\014', 'U', 'n', 'a', 'u', -'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', -':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', -'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', -'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', '\n', '\006', 'R', 'e', 'a', 's', -'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', -'\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\001', ':', '9', -'\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', -'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', -'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', -'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', -'a', 'g', 's', '\"', '\305', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'R', '\n', '\013', -'t', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', -'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\n', 't', 'l', 's', 'V', 'e', -'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', 'e', -'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', 'h', 'e', 'r', 'S', 'u', 'i', -'t', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', -'\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '~', '\n', '\034', 'l', 'o', -'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', -'s', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', -'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\032', 'l', 'o', 'c', 'a', -'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '|', '\n', -'\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', -'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', -'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', -'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\031', 'p', 'e', -'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '$', -'\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\014', 't', -'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', 'f', 'i', 'n', 'g', 'e', 'r', -'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', -'n', 't', '\032', '\231', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', -'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', -'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', -'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', -'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\030', '\n', -'\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\026', -'\n', '\006', 'i', 's', 's', 'u', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\006', 'i', 's', 's', 'u', 'e', 'r', '\032', '\222', '\001', -'\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\003', 'u', 'r', 'i', '\030', '\001', -' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', '\002', ' ', '\001', '(', '\t', 'H', -'\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', -'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', -'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', 'a', 'n', ':', 'B', '\232', '\305', -'\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', -'.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', -'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', 'L', 'S', 'V', 'e', 'r', 's', -'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', -'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '1', -'\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', -'3', '\020', '\004', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', -'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', -'\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', -'\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\001', ' ', '\001', '(', '\016', '2', -'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', -'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\r', 'r', 'e', -'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\002', ' ', '\001', -'(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '0', '\n', '\004', 'p', 'o', 'r', 't', '\030', '\004', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\005', -' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '\030', -'\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', '\007', 'r', 'e', 'f', 'e', 'r', -'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', '\n', '\r', 'f', 'o', 'r', 'w', -'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', -'d', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\t', ' ', '\001', '(', '\t', 'R', -'\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'p', 'a', -'t', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', 'a', 't', 'h', '\022', '2', '\n', -'\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\013', ' ', -'\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', -',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\014', ' ', '\001', -'(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'k', '\n', '\017', 'r', -'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 'n', -'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', -'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 'q', 'u', 'e', 's', -'t', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', -'d', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', -'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', -'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', 'd', 'o', 'w', 'n', 's', 't', +'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '6', '\n', '\027', 'd', 'o', 'w', 'n', 's', +'t', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'r', 'e', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\010', 'R', +'\025', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'R', 'e', 's', 'e', 't', '\032', '\325', '\001', +'\n', '\014', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', +'\001', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', +'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', +'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', +'\n', '\006', 'R', 'e', 'a', 's', 'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', +'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', +'C', 'E', '\020', '\001', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', +'.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', +'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', +'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\"', '\305', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', +'e', 's', '\022', 'R', '\n', '\013', 't', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', +'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', +'\n', 't', 'l', 's', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', +'_', 's', 'u', 'i', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', +'h', 'e', 'r', 'S', 'u', 'i', 't', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', +'a', 'm', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', +'\022', '~', '\n', '\034', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', +'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', +'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', +'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'R', '\032', 'l', 'o', 'c', 'a', 'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', +'i', 'e', 's', '\022', '|', '\n', '\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', +'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', +'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', +'e', 's', 'R', '\031', 'p', 'e', 'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', +'t', 'i', 'e', 's', '\022', '$', '\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', +'\001', '(', '\t', 'R', '\014', 't', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', +'f', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', +'g', 'e', 'r', 'p', 'r', 'i', 'n', 't', '\032', '\231', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', +'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', +'n', 'a', 'm', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', +'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', +'a', 'm', 'e', '\022', '\030', '\n', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', +'j', 'e', 'c', 't', '\022', '\026', '\n', '\006', 'i', 's', 's', 'u', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\006', 'i', 's', 's', +'u', 'e', 'r', '\032', '\222', '\001', '\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', +'\003', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', +'\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', +'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', +'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', +'a', 'n', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', +'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', +'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', +'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', +'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\020', '\001', '\022', '\013', '\n', '\007', 'T', +'L', 'S', 'v', '1', '_', '1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', +'T', 'L', 'S', 'v', '1', '_', '3', '\020', '\004', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', +'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '\"', '\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', +'e', 'r', 't', 'i', 'e', 's', '\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', +'\001', ' ', '\001', '(', '\016', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', +'\020', '\001', 'R', '\r', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', +'m', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', +'r', 'i', 't', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '0', '\n', '\004', +'p', 'o', 'r', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', +'p', 'a', 't', 'h', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', +'a', 'g', 'e', 'n', 't', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', +'\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', +'\n', '\r', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', +'r', 'w', 'a', 'r', 'd', 'e', 'd', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', +'\t', ' ', '\001', '(', '\t', 'R', '\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', +'n', 'a', 'l', '_', 'p', 'a', 't', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', +'a', 't', 'h', '\022', '2', '\n', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', +'t', 'e', 's', '\030', '\013', ' ', '\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', +'B', 'y', 't', 'e', 's', '\022', ',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', +'e', 's', '\030', '\014', ' ', '\001', '(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', +'s', '\022', 'k', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', +'\013', '2', 'B', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', +'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', +'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', +'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', +'s', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', +'d', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', +'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', +'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', +'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', +'\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', +'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', +'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', +'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', +'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'r', 'e', 's', +'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', +'d', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', +'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', +'_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', +'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', +'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', +'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', +'r', '\n', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', +'\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', +'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', '_', 'c', 'o', 'd', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', +'s', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', -'d', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', -'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', -'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', -'\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', -'e', ':', '\002', '8', '\001', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', -'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', -'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', -'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', -'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', -'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', -'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', -'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'o', 'd', 'y', '_', -'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 'y', -'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', -'\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', -'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', -'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'r', '\n', '\021', 'r', 'e', 's', -'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 'n', -'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', -'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', -'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', -'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', -'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', -'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', -'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\007', ' ', '\001', '(', -'\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', -'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', -'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\031', 'd', 'o', 'w', 'n', 's', -'t', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\032', 'B', '\n', '\024', 'R', -'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', +'d', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', +'t', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', +'_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', +'\031', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', +'t', '\032', 'B', '\n', '\024', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', +'\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', +'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', 'C', '\n', '\025', 'R', 'e', +'s', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', -'(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', 'C', '\n', '\025', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', -'\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', -'l', 'u', 'e', ':', '\002', '8', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', -'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\313', '\002', '\n', '\r', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', -'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', '\n', '\024', 'T', 'c', 'p', 'U', -'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', '\017', '\n', '\013', 'T', 'c', 'p', -'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'S', 't', 'a', 'r', -'t', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', -'\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\006', '\022', '\025', '\n', '\021', -'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', '\022', '\024', '\n', '\020', 'U', 'p', -'s', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', '\013', 'U', 'p', 's', 't', 'r', -'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'u', 'n', -'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 'e', -'d', '\020', '\n', '\022', '\036', '\n', '\032', 'U', 'd', 'p', 'T', 'u', 'n', 'n', 'e', 'l', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', -'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\013', '\022', '\017', '\n', '\013', 'U', 'd', 'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', -'\020', '\014', '\022', '\021', '\n', '\r', 'U', 'd', 'p', 'S', 'e', 's', 's', 'i', 'o', 'n', 'E', 'n', 'd', '\020', '\r', 'B', '\215', '\001', '\n', -'%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', -'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', -'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', -'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', ';', 'a', 'c', 'c', 'e', -'s', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', +'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', +'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\313', '\002', '\n', '\r', 'A', 'c', +'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', +'\n', '\024', 'T', 'c', 'p', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', +'\017', '\n', '\013', 'T', 'c', 'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', +'a', 'm', 'S', 't', 'a', 'r', 't', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', +'r', 'i', 'o', 'd', 'i', 'c', '\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', +'\020', '\006', '\022', '\025', '\n', '\021', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', +'\022', '\024', '\n', '\020', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', +'\013', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', +'e', 'a', 'm', 'T', 'u', 'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', +'b', 'l', 'i', 's', 'h', 'e', 'd', '\020', '\n', '\022', '\036', '\n', '\032', 'U', 'd', 'p', 'T', 'u', 'n', 'n', 'e', 'l', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\013', '\022', '\017', '\n', '\013', 'U', 'd', 'p', 'P', 'e', +'r', 'i', 'o', 'd', 'i', 'c', '\020', '\014', '\022', '\021', '\n', '\r', 'U', 'd', 'p', 'S', 'e', 's', 's', 'i', 'o', 'n', 'E', 'n', 'd', +'\020', '\r', 'B', '\215', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', +'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', +'s', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', +'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', +'3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', +'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -400,5 +403,5 @@ _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit = { deps, &envoy_data_accesslog_v3_accesslog_proto_upb_file_layout, "envoy/data/accesslog/v3/accesslog.proto", - UPB_STRINGVIEW_INIT(descriptor, 9023) + UPB_STRINGVIEW_INIT(descriptor, 9079) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c new file mode 100644 index 0000000000..46edcb75a2 --- /dev/null +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c @@ -0,0 +1,86 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/reflection/def.h" +#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h" +#include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h" + +extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; +extern _upb_DefPool_Init envoy_config_core_v3_http_uri_proto_upbdefinit; +extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; +extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; +extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; +extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; +extern _upb_DefPool_Init validate_validate_proto_upbdefinit; +static const char descriptor[1207] = {'\n', ':', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +'s', '/', 'h', 't', 't', 'p', '/', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', 'n', '/', 'v', '3', '/', 'g', 'c', 'p', '_', 'a', +'u', 't', 'h', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '*', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', +'n', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', +'3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', +'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', +'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', +'\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', +'.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', +'.', 'p', 'r', 'o', 't', 'o', '\"', '\301', '\003', '\n', '\024', 'G', 'c', 'p', 'A', 'u', 't', 'h', 'n', 'F', 'i', 'l', 't', 'e', 'r', +'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\010', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\013', '2', +'\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', +'t', 'p', 'U', 'r', 'i', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\007', 'h', 't', 't', 'p', 'U', +'r', 'i', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', +'!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', +'t', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '_', '\n', +'\014', 'c', 'a', 'c', 'h', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', +'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', +'p', '.', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', 'n', '.', 'v', '3', '.', 'T', 'o', 'k', 'e', 'n', 'C', 'a', 'c', 'h', 'e', +'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 'c', 'a', 'c', 'h', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\014', 't', 'o', +'k', 'e', 'n', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', +'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'g', +'c', 'p', '_', 'a', 'u', 't', 'h', 'n', '.', 'v', '3', '.', 'T', 'o', 'k', 'e', 'n', 'H', 'e', 'a', 'd', 'e', 'r', 'R', '\013', +'t', 'o', 'k', 'e', 'n', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '\030', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\005', ' ', +'\001', '(', '\t', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', 'E', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\006', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\020', '\372', 'B', '\r', '\252', '\001', '\n', '\032', '\006', '\010', '\200', '\200', '\200', '\200', '\020', '2', '\000', 'R', +'\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\"', '%', '\n', '\010', 'A', 'u', 'd', 'i', 'e', 'n', 'c', 'e', '\022', '\031', '\n', '\003', 'u', +'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'u', 'r', 'l', '\"', '`', '\n', +'\020', 'T', 'o', 'k', 'e', 'n', 'C', 'a', 'c', 'h', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\n', 'c', 'a', 'c', 'h', +'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\017', '\372', 'B', '\014', '2', '\n', '\030', +'\377', '\377', '\377', '\377', '\377', '\377', '\377', '\377', '\177', 'R', '\t', 'c', 'a', 'c', 'h', 'e', 'S', 'i', 'z', 'e', '\"', '`', '\n', '\013', 'T', +'o', 'k', 'e', 'n', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '.', '\n', '\014', 'v', +'a', 'l', 'u', 'e', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', +'\001', '\002', '\310', '\001', '\000', 'R', '\013', 'v', 'a', 'l', 'u', 'e', 'P', 'r', 'e', 'f', 'i', 'x', 'B', '\262', '\001', '\n', '8', 'i', 'o', +'.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', +'n', '.', 'v', '3', 'B', '\r', 'G', 'c', 'p', 'A', 'u', 't', 'h', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ']', 'g', 'i', +'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', +'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', +'n', '/', 'v', '3', ';', 'g', 'c', 'p', '_', 'a', 'u', 't', 'h', 'n', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', +'\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static _upb_DefPool_Init *deps[8] = { + &envoy_config_core_v3_base_proto_upbdefinit, + &envoy_config_core_v3_http_uri_proto_upbdefinit, + &google_protobuf_duration_proto_upbdefinit, + &google_protobuf_wrappers_proto_upbdefinit, + &envoy_annotations_deprecation_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +_upb_DefPool_Init envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit = { + deps, + &envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upb_file_layout, + "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto", + UPB_STRINGVIEW_INIT(descriptor, 1207) +}; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h new file mode 100644 index 0000000000..54b22313e3 --- /dev/null +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h @@ -0,0 +1,47 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ + +#include "upb/reflection/def.h" +#include "upb/reflection/internal/def_pool.h" + +#include "upb/port/def.inc" // Must be last. +#ifdef __cplusplus +extern "C" { +#endif + +extern _upb_DefPool_Init envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit; + +UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig"); +} + +UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_Audience_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.gcp_authn.v3.Audience"); +} + +UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.gcp_authn.v3.TokenCacheConfig"); +} + +UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.gcp_authn.v3.TokenHeader"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ */ diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c index 9f0197369f..0014dbf917 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[1080] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +static const char descriptor[1173] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\022', '%', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', @@ -26,39 +26,42 @@ static const char descriptor[1080] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', ' 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', -'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\335', '\003', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', +'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\272', '\004', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\027', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', -'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'W', '\n', -'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', -'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', -'\005', '\021', '\022', '\017', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', -'\010', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', -'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', -'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', -'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', -'w', 'R', 'u', 'l', 'e', 's', '\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', -'\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', -'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', -'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', -'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', -'_', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', -'\025', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', ':', ',', '\232', -'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', -'.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', -'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\001', '(', '\013', '2', -'+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', -'s', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', -':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', -'t', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', -'o', 'u', 't', 'e', 'J', '\004', '\010', '\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', -'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', -'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', -'t', 'o', 'P', '\001', 'Z', 'S', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', -'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', -'/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', -'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', '*', '\n', +'\021', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\006', ' ', '\001', '(', '\t', 'R', +'\017', 'r', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', 'W', '\n', '\007', 'm', 'a', 't', 'c', 'h', +'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', +'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', 'r', 'u', +'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\007', 'm', 'a', +'t', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', +'.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', +'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', +'\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', +'\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', +'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', +'s', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\r', 's', 'h', 'a', 'd', +'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', 's', +'_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\025', 's', 'h', 'a', 'd', 'o', +'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '/', '\n', '\024', 't', 'r', 'a', 'c', 'k', +'_', 'p', 'e', 'r', '_', 'r', 'u', 'l', 'e', '_', 's', 't', 'a', 't', 's', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\021', 't', 'r', +'a', 'c', 'k', 'P', 'e', 'r', 'R', 'u', 'l', 'e', 'S', 't', 'a', 't', 's', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'r', +'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 'o', +'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', +'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', ':', '4', '\232', '\305', '\210', '\036', '/', +'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', +'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', 'J', '\004', '\010', +'\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', +'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', +'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'S', 'g', +'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', +'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', +';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -75,5 +78,5 @@ _upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit = deps, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout, "envoy/extensions/filters/http/rbac/v3/rbac.proto", - UPB_STRINGVIEW_INIT(descriptor, 1080) + UPB_STRINGVIEW_INIT(descriptor, 1173) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c index b5a197ca70..80b0d31733 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c @@ -31,7 +31,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[13438] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +static const char descriptor[13490] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'n', 'e', 't', 'w', 'o', 'r', 'k', '/', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '/', 'v', '3', '/', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', ';', 'e', 'n', 'v', 'o', 'y', '.', 'e', @@ -69,7 +69,7 @@ static const char descriptor[13438] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', -'o', 't', 'o', '\"', '\236', 'A', '\n', '\025', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', +'o', 't', 'o', '\"', '\322', 'A', '\n', '\025', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '\205', '\001', '\n', '\n', 'c', 'o', 'd', 'e', 'c', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\\', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', @@ -279,296 +279,298 @@ static const char descriptor[13438] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'R', '\033', 't', 'y', 'p', 'e', 'd', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'p', 'o', 'r', 't', '\030', '3', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', -'a', 'r', 'd', 'e', 'd', 'P', 'o', 'r', 't', '\022', 'h', '\n', '#', 'a', 'd', 'd', '_', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', -'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'e', '\030', '5', -' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', -'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\037', 'a', 'd', 'd', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\032', '\302', '\005', '\n', '\007', 'T', 'r', 'a', 'c', 'i', -'n', 'g', '\022', '?', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', -'(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', -'t', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'r', 'a', 'n', 'd', -'o', 'm', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', -'.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', 'm', 'S', -'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'A', '\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', 'l', 'i', -'n', 'g', '\030', '\005', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', -'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', -'\030', '\n', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', -'\022', 'K', '\n', '\023', 'm', 'a', 'x', '_', 'p', 'a', 't', 'h', '_', 't', 'a', 'g', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\007', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'm', 'a', 'x', 'P', 'a', 't', 'h', 'T', 'a', 'g', 'L', 'e', 'n', 'g', -'t', 'h', '\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', '\030', '\010', ' ', '\003', '(', '\013', '2', ' ', -'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', -'s', 't', 'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', '\022', '?', '\n', '\010', 'p', 'r', -'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'R', -'\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', 'J', '\n', '\023', 's', 'p', 'a', 'w', 'n', '_', 'u', 'p', 's', 't', 'r', 'e', -'a', 'm', '_', 's', 'p', 'a', 'n', '\030', '\n', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 's', 'p', 'a', 'w', 'n', 'U', 'p', -'s', 't', 'r', 'e', 'a', 'm', 'S', 'p', 'a', 'n', '\"', '(', '\n', '\r', 'O', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', 'N', 'a', -'m', 'e', '\022', '\013', '\n', '\007', 'I', 'N', 'G', 'R', 'E', 'S', 'S', '\020', '\000', '\022', '\n', '\n', '\006', 'E', 'G', 'R', 'E', 'S', 'S', -'\020', '\001', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', -'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'J', '\004', '\010', '\001', '\020', -'\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\016', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', 'R', '\030', -'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'f', 'o', 'r', '_', 't', 'a', 'g', 's', '\032', -'\347', '\001', '\n', '\025', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', 'g', -'\022', '!', '\n', '\014', 'u', 'n', 'i', 'x', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\013', 'u', -'n', 'i', 'x', 'S', 'o', 'c', 'k', 'e', 't', 's', '\022', '@', '\n', '\013', 'c', 'i', 'd', 'r', '_', 'r', 'a', 'n', 'g', 'e', 's', -'\030', '\002', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'R', '\n', 'c', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', -'s', ':', 'i', '\232', '\305', '\210', '\036', 'd', '\n', 'b', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', -'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', -'s', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\230', '\002', '\n', '\033', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', -'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '4', '\n', '\007', 's', 'u', 'b', 'j', 'e', 'c', -'t', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\022', '\n', '\004', 'c', 'e', -'r', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\004', 'c', 'e', 'r', 't', '\022', '\024', '\n', '\005', 'c', 'h', 'a', 'i', 'n', '\030', '\006', -' ', '\001', '(', '\010', 'R', '\005', 'c', 'h', 'a', 'i', 'n', '\022', '\020', '\n', '\003', 'd', 'n', 's', '\030', '\004', ' ', '\001', '(', '\010', 'R', -'\003', 'd', 'n', 's', '\022', '\020', '\n', '\003', 'u', 'r', 'i', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\003', 'u', 'r', 'i', ':', 'o', '\232', -'\305', '\210', '\036', 'j', '\n', 'h', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', -'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', -'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', 't', 'C', -'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'J', '\004', '\010', '\002', '\020', '\003', '\032', '\256', '\002', '\n', '\r', 'U', 'p', 'g', 'r', -'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', 'p', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', 'a', '\n', '\007', 'f', 'i', -'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', -'s', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', -'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', -'t', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '4', '\n', '\007', 'e', 'n', 'a', -'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', ':', 'a', '\232', -'\305', '\210', '\036', '\\', '\n', 'Z', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', -'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', -'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\345', '\001', '\n', -'\030', 'P', 'a', 't', 'h', 'N', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', -'\022', 'c', '\n', '\031', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', -'t', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', -'t', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', -'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', -'n', '\022', 'd', '\n', '\032', 'h', 't', 't', 'p', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', -'m', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', -'.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', -'o', 'n', 'R', '\030', 'h', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', -'i', 'o', 'n', '\032', '\344', '\002', '\n', '\021', 'P', 'r', 'o', 'x', 'y', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', -'\022', '%', '\n', '\016', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', -'\r', 'r', 'e', 'm', 'o', 'v', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'Q', '\n', '%', 'r', 'e', 'm', 'o', 'v', 'e', '_', -'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'd', 'e', -'t', 'a', 'i', 'l', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\"', 'r', 'e', 'm', 'o', 'v', 'e', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '2', '\n', -'\025', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\023', 'r', 'e', 'm', 'o', 'v', 'e', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', -'A', '\n', '\035', 's', 'e', 't', '_', 'r', 'e', 'c', 'o', 'm', 'm', 'e', 'n', 'd', 'e', 'd', '_', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\032', 's', 'e', 't', 'R', 'e', 'c', 'o', 'm', 'm', 'e', -'n', 'd', 'e', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', ' ', '\n', '\013', 'u', 's', 'e', '_', 'n', -'o', 'd', 'e', '_', 'i', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'u', 's', 'e', 'N', 'o', 'd', 'e', 'I', 'd', -'\022', '.', '\n', '\022', 'l', 'i', 't', 'e', 'r', 'a', 'l', '_', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', -'\001', '(', '\t', 'H', '\000', 'R', '\020', 'l', 'i', 't', 'e', 'r', 'a', 'l', 'P', 'r', 'o', 'x', 'y', 'N', 'a', 'm', 'e', 'B', '\014', -'\n', '\n', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\032', '\235', '\002', '\n', '\023', 'H', 'c', 'm', 'A', 'c', 'c', 'e', 's', -'s', 'L', 'o', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'b', '\n', '\031', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', -'_', 'f', 'l', 'u', 's', 'h', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', -'\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'l', -'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\037', 'f', 'l', 'u', 's', 'h', '_', 'a', 'c', 'c', 'e', -'s', 's', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 'n', 'e', 'w', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\002', ' ', '\001', -'(', '\010', 'R', '\032', 'f', 'l', 'u', 's', 'h', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'O', 'n', 'N', 'e', 'w', 'R', 'e', -'q', 'u', 'e', 's', 't', '\022', ']', '\n', ',', 'f', 'l', 'u', 's', 'h', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 't', 'u', 'n', -'n', 'e', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', '_', 'e', 's', 't', 'a', 'b', 'l', 'i', 's', -'h', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\'', 'f', 'l', 'u', 's', 'h', 'L', 'o', 'g', 'O', 'n', 'T', 'u', 'n', 'n', -'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 'e', 'd', -'\"', '6', '\n', '\t', 'C', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\t', -'\n', '\005', 'H', 'T', 'T', 'P', '1', '\020', '\001', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\002', '\022', '\t', '\n', '\005', 'H', -'T', 'T', 'P', '3', '\020', '\003', '\"', 'S', '\n', '\032', 'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', -'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', '\r', '\n', '\t', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '\020', -'\000', '\022', '\024', '\n', '\020', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\020', -'\n', '\014', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '\020', '\002', '\"', 'y', '\n', '\030', 'F', 'o', 'r', 'w', 'a', -'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\014', '\n', '\010', 'S', 'A', -'N', 'I', 'T', 'I', 'Z', 'E', '\020', '\000', '\022', '\020', '\n', '\014', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', -'\001', '\022', '\022', '\n', '\016', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '\020', '\002', '\022', '\020', '\n', '\014', -'S', 'A', 'N', 'I', 'T', 'I', 'Z', 'E', '_', 'S', 'E', 'T', '\020', '\003', '\022', '\027', '\n', '\023', 'A', 'L', 'W', 'A', 'Y', 'S', '_', -'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', '\004', '\"', '\240', '\001', '\n', '\034', 'P', 'a', 't', 'h', 'W', 'i', -'t', 'h', 'E', 's', 'c', 'a', 'p', 'e', 'd', 'S', 'l', 'a', 's', 'h', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', -'\037', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'A', 'T', 'I', 'O', 'N', '_', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'C', '_', -'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\022', '\n', '\016', 'K', 'E', 'E', 'P', '_', 'U', 'N', 'C', 'H', 'A', 'N', 'G', -'E', 'D', '\020', '\001', '\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\002', '\022', -'\031', '\n', '\025', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', -'\003', '\022', '\030', '\n', '\024', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', -'\020', '\004', ':', 'S', '\232', '\305', '\210', '\036', 'N', '\n', 'L', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', -'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\026', '\n', '\017', 'r', 'o', 'u', 't', 'e', '_', 's', 'p', 'e', -'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\021', '\n', '\017', 's', 't', 'r', 'i', 'p', '_', 'p', 'o', 'r', 't', -'_', 'm', 'o', 'd', 'e', 'J', '\004', '\010', '\033', '\020', '\034', 'J', '\004', '\010', '\013', '\020', '\014', 'R', '\014', 'i', 'd', 'l', 'e', '_', 't', -'i', 'm', 'e', 'o', 'u', 't', '\"', '\312', '\001', '\n', '\020', 'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', -'i', 'g', '\022', 'e', '\n', '\007', 'm', 'a', 'p', 'p', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'M', 'a', 'p', 'p', 'e', 'r', 'R', '\007', 'm', 'a', -'p', 'p', 'e', 'r', 's', '\022', 'O', '\n', '\013', 'b', 'o', 'd', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', -'\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', -'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'R', -'\n', 'b', 'o', 'd', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\234', '\003', '\n', '\016', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'M', -'a', 'p', 'p', 'e', 'r', '\022', 'L', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', -'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', -'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'J', '\n', '\013', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', '\030', '\002', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'R', '\n', 's', -'t', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', -'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', 'd', 'y', '\022', '`', '\n', '\024', 'b', 'o', 'd', 'y', '_', 'f', 'o', 'r', -'m', 'a', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', -'t', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'R', '\022', 'b', 'o', 'd', 'y', 'F', 'o', 'r', -'m', 'a', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'X', '\n', '\016', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', -'_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', -'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', -'d', '\"', '\307', '\001', '\n', '\003', 'R', 'd', 's', '\022', 'Q', '\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', -'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', -'\002', '\020', '\001', 'R', '\014', 'c', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '*', '\n', '\021', 'r', 'o', 'u', 't', -'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'r', 'o', 'u', 't', -'e', 'C', 'o', 'n', 'f', 'i', 'g', 'N', 'a', 'm', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', -'t', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', -'R', 'd', 's', '\"', '\367', '\001', '\n', '\035', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', -'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'y', '\n', '\033', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', -'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', -'/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'S', -'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', -'\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\031', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', -'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', -'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', -'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', -'i', 's', 't', '\"', '\345', '\016', '\n', '\014', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', '\033', '\n', '\004', 'n', -'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', -'\217', '\001', '\n', '\021', 's', 'c', 'o', 'p', 'e', '_', 'k', 'e', 'y', '_', 'b', 'u', 'i', 'l', 'd', 'e', 'r', '\030', '\002', ' ', '\001', -'(', '\013', '2', 'Y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', -'t', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', -'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', -'\002', '\020', '\001', 'R', '\017', 's', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', 'N', '\n', '\021', 'r', -'d', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\"', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', -'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\017', 'r', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', -'\022', '\245', '\001', '\n', ' ', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', -'r', 'a', 't', 'i', 'o', 'n', 's', '_', 'l', 'i', 's', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', -'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', -'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', -'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', -'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', 'H', '\000', 'R', '\035', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', -'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'g', '\n', '\n', 's', 'c', 'o', -'p', 'e', 'd', '_', 'r', 'd', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', +'a', 'r', 'd', 'e', 'd', 'P', 'o', 'r', 't', '\022', '2', '\n', '\025', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'l', 'o', 'c', 'a', 'l', +'_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\030', '9', ' ', '\001', '(', '\010', 'R', '\023', 'a', 'p', 'p', 'e', 'n', 'd', 'L', 'o', +'c', 'a', 'l', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\022', 'h', '\n', '#', 'a', 'd', 'd', '_', 'p', 'r', 'o', 'x', 'y', '_', +'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'e', +'\030', '5', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\037', 'a', 'd', 'd', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\032', '\302', '\005', '\n', '\007', 'T', 'r', 'a', +'c', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', +' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', +'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'r', 'a', +'n', 'd', 'o', 'm', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', +'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', +'m', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'A', '\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', +'l', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', +'3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', +'g', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\007', 'v', 'e', 'r', 'b', 'o', +'s', 'e', '\022', 'K', '\n', '\023', 'm', 'a', 'x', '_', 'p', 'a', 't', 'h', '_', 't', 'a', 'g', '_', 'l', 'e', 'n', 'g', 't', 'h', +'\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'm', 'a', 'x', 'P', 'a', 't', 'h', 'T', 'a', 'g', 'L', 'e', +'n', 'g', 't', 'h', '\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', '\030', '\010', ' ', '\003', '(', '\013', +'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', +'C', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', '\022', '?', '\n', '\010', +'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', +'p', 'R', '\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', 'J', '\n', '\023', 's', 'p', 'a', 'w', 'n', '_', 'u', 'p', 's', 't', +'r', 'e', 'a', 'm', '_', 's', 'p', 'a', 'n', '\030', '\n', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 's', 'p', 'a', 'w', 'n', +'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'S', 'p', 'a', 'n', '\"', '(', '\n', '\r', 'O', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', +'N', 'a', 'm', 'e', '\022', '\013', '\n', '\007', 'I', 'N', 'G', 'R', 'E', 'S', 'S', '\020', '\000', '\022', '\n', '\n', '\006', 'E', 'G', 'R', 'E', +'S', 'S', '\020', '\001', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'J', '\004', '\010', +'\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\016', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', +'R', '\030', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'f', 'o', 'r', '_', 't', 'a', 'g', +'s', '\032', '\347', '\001', '\n', '\025', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '!', '\n', '\014', 'u', 'n', 'i', 'x', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', +'\013', 'u', 'n', 'i', 'x', 'S', 'o', 'c', 'k', 'e', 't', 's', '\022', '@', '\n', '\013', 'c', 'i', 'd', 'r', '_', 'r', 'a', 'n', 'g', +'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'R', '\n', 'c', 'i', 'd', 'r', 'R', 'a', 'n', +'g', 'e', 's', ':', 'i', '\232', '\305', '\210', '\036', 'd', '\n', 'b', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', +'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\230', '\002', '\n', '\033', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', +'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '4', '\n', '\007', 's', 'u', 'b', 'j', +'e', 'c', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\022', '\n', '\004', +'c', 'e', 'r', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\004', 'c', 'e', 'r', 't', '\022', '\024', '\n', '\005', 'c', 'h', 'a', 'i', 'n', +'\030', '\006', ' ', '\001', '(', '\010', 'R', '\005', 'c', 'h', 'a', 'i', 'n', '\022', '\020', '\n', '\003', 'd', 'n', 's', '\030', '\004', ' ', '\001', '(', +'\010', 'R', '\003', 'd', 'n', 's', '\022', '\020', '\n', '\003', 'u', 'r', 'i', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\003', 'u', 'r', 'i', ':', +'o', '\232', '\305', '\210', '\036', 'j', '\n', 'h', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', +'t', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'J', '\004', '\010', '\002', '\020', '\003', '\032', '\256', '\002', '\n', '\r', 'U', 'p', +'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', +'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', 'a', '\n', '\007', +'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', -'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'H', '\000', 'R', '\t', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\032', '\337', -'\t', '\n', '\017', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\221', '\001', '\n', '\t', 'f', 'r', -'a', 'g', 'm', 'e', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'i', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', -'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', -'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', -'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', -'\222', '\001', '\002', '\010', '\001', 'R', '\t', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\032', '\333', '\007', '\n', '\017', 'F', 'r', 'a', 'g', -'m', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\266', '\001', '\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', -'l', 'u', 'e', '_', 'e', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '~', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', -'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', -'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'H', '\000', 'R', -'\024', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\032', '\225', '\005', '\n', -'\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\022', '!', '\n', '\004', -'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', -'R', '\004', 'n', 'a', 'm', 'e', '\022', '+', '\n', '\021', 'e', 'l', 'e', 'm', 'e', 'n', 't', '_', 's', 'e', 'p', 'a', 'r', 'a', 't', -'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\020', 'e', 'l', 'e', 'm', 'e', 'n', 't', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'o', -'r', '\022', '\026', '\n', '\005', 'i', 'n', 'd', 'e', 'x', '\030', '\003', ' ', '\001', '(', '\r', 'H', '\000', 'R', '\005', 'i', 'n', 'd', 'e', 'x', -'\022', '\245', '\001', '\n', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\210', '\001', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', -'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', -'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '.', 'K', 'v', -'E', 'l', 'e', 'm', 'e', 'n', 't', 'H', '\000', 'R', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\032', '\333', '\001', '\n', '\t', 'K', 'v', -'E', 'l', 'e', 'm', 'e', 'n', 't', '\022', '%', '\n', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', -'\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\022', '\031', '\n', '\003', -'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', '\213', -'\001', '\232', '\305', '\210', '\036', '\205', '\001', '\n', '\202', '\001', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', -'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', -'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', -'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', -'a', 'c', 't', 'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', ':', '\177', '\232', '\305', '\210', '\036', 'z', '\n', 'x', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', -'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', -'.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', -'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', -'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'B', '\016', '\n', '\014', 'e', 'x', -'t', 'r', 'a', 'c', 't', '_', 't', 'y', 'p', 'e', ':', 'j', '\232', '\305', '\210', '\036', 'e', '\n', 'c', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', -'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', -'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', -'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\013', '\n', '\004', 't', 'y', 'p', -'e', '\022', '\003', '\370', 'B', '\001', ':', 'Z', '\232', '\305', '\210', '\036', 'U', '\n', 'S', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', -'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', -'d', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', ':', 'J', -'\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', -'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'B', -'\027', '\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', -'\361', '\001', '\n', '\t', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\022', 'e', '\n', '\030', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', -'d', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', -'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\025', 's', 'c', 'o', 'p', 'e', -'d', 'R', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '4', '\n', '\026', 's', 'r', 'd', 's', '_', -'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\024', -'s', 'r', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', ':', 'G', '\232', '\305', '\210', -'\036', 'B', '\n', '@', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', -'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', -'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\"', '\350', '\002', '\n', '\n', 'H', 't', -'t', 'p', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', -'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', -'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'X', '\n', '\020', -'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '+', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'x', 't', 'e', -'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\017', 'c', 'o', 'n', 'f', -'i', 'g', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', -'l', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\022', '\032', '\n', '\010', 'd', 'i', -'s', 'a', 'b', 'l', 'e', 'd', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', 'H', '\232', -'\305', '\210', '\036', 'C', '\n', 'A', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', -'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', -'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', -'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', -'c', 'o', 'n', 'f', 'i', 'g', '\"', '\237', '\001', '\n', '\022', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', -'s', 'i', 'o', 'n', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', -'\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', -'t', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'P', '\232', '\305', '\210', '\036', 'K', '\n', 'I', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', -'t', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', -'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\216', '\001', '\n', ' ', 'E', 'n', -'v', 'o', 'y', 'M', 'o', 'b', 'i', 'l', 'e', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', -'n', 'a', 'g', 'e', 'r', '\022', 'j', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 'R', '.', 'e', +'.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '4', '\n', '\007', 'e', +'n', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', ':', +'a', '\232', '\305', '\210', '\036', '\\', '\n', 'Z', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\345', +'\001', '\n', '\030', 'P', 'a', 't', 'h', 'N', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', 'c', '\n', '\031', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', +'m', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', +'o', 'n', 'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', +'i', 'o', 'n', '\022', 'd', '\n', '\032', 'h', 't', 't', 'p', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 't', 'r', 'a', 'n', 's', 'f', +'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', +'t', 'i', 'o', 'n', 'R', '\030', 'h', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', +'a', 't', 'i', 'o', 'n', '\032', '\344', '\002', '\n', '\021', 'P', 'r', 'o', 'x', 'y', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '%', '\n', '\016', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\001', ' ', '\001', '(', +'\010', 'R', '\r', 'r', 'e', 'm', 'o', 'v', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'Q', '\n', '%', 'r', 'e', 'm', 'o', 'v', +'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', +'d', 'e', 't', 'a', 'i', 'l', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\"', 'r', 'e', 'm', 'o', 'v', 'e', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', +'2', '\n', '\025', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', +'\003', ' ', '\001', '(', '\010', 'R', '\023', 'r', 'e', 'm', 'o', 'v', 'e', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', +'s', '\022', 'A', '\n', '\035', 's', 'e', 't', '_', 'r', 'e', 'c', 'o', 'm', 'm', 'e', 'n', 'd', 'e', 'd', '_', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\032', 's', 'e', 't', 'R', 'e', 'c', 'o', 'm', +'m', 'e', 'n', 'd', 'e', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', ' ', '\n', '\013', 'u', 's', 'e', +'_', 'n', 'o', 'd', 'e', '_', 'i', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'u', 's', 'e', 'N', 'o', 'd', 'e', +'I', 'd', '\022', '.', '\n', '\022', 'l', 'i', 't', 'e', 'r', 'a', 'l', '_', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\030', +'\006', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\020', 'l', 'i', 't', 'e', 'r', 'a', 'l', 'P', 'r', 'o', 'x', 'y', 'N', 'a', 'm', 'e', +'B', '\014', '\n', '\n', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\032', '\235', '\002', '\n', '\023', 'H', 'c', 'm', 'A', 'c', 'c', +'e', 's', 's', 'L', 'o', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'b', '\n', '\031', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', +'o', 'g', '_', 'f', 'l', 'u', 's', 'h', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', +'F', 'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\037', 'f', 'l', 'u', 's', 'h', '_', 'a', 'c', +'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 'n', 'e', 'w', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\002', +' ', '\001', '(', '\010', 'R', '\032', 'f', 'l', 'u', 's', 'h', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'O', 'n', 'N', 'e', 'w', +'R', 'e', 'q', 'u', 'e', 's', 't', '\022', ']', '\n', ',', 'f', 'l', 'u', 's', 'h', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 't', +'u', 'n', 'n', 'e', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', '_', 'e', 's', 't', 'a', 'b', 'l', +'i', 's', 'h', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\'', 'f', 'l', 'u', 's', 'h', 'L', 'o', 'g', 'O', 'n', 'T', 'u', +'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', +'e', 'd', '\"', '6', '\n', '\t', 'C', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', +'\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '1', '\020', '\001', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\002', '\022', '\t', '\n', +'\005', 'H', 'T', 'T', 'P', '3', '\020', '\003', '\"', 'S', '\n', '\032', 'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', +'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', '\r', '\n', '\t', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', +'E', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', +'\022', '\020', '\n', '\014', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '\020', '\002', '\"', 'y', '\n', '\030', 'F', 'o', 'r', +'w', 'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\014', '\n', '\010', +'S', 'A', 'N', 'I', 'T', 'I', 'Z', 'E', '\020', '\000', '\022', '\020', '\n', '\014', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', +'Y', '\020', '\001', '\022', '\022', '\n', '\016', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '\020', '\002', '\022', '\020', +'\n', '\014', 'S', 'A', 'N', 'I', 'T', 'I', 'Z', 'E', '_', 'S', 'E', 'T', '\020', '\003', '\022', '\027', '\n', '\023', 'A', 'L', 'W', 'A', 'Y', +'S', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', '\004', '\"', '\240', '\001', '\n', '\034', 'P', 'a', 't', 'h', +'W', 'i', 't', 'h', 'E', 's', 'c', 'a', 'p', 'e', 'd', 'S', 'l', 'a', 's', 'h', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', +'#', '\n', '\037', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'A', 'T', 'I', 'O', 'N', '_', 'S', 'P', 'E', 'C', 'I', 'F', 'I', +'C', '_', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\022', '\n', '\016', 'K', 'E', 'E', 'P', '_', 'U', 'N', 'C', 'H', 'A', +'N', 'G', 'E', 'D', '\020', '\001', '\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', +'\002', '\022', '\031', '\n', '\025', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', +'T', '\020', '\003', '\022', '\030', '\n', '\024', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', +'R', 'D', '\020', '\004', ':', 'S', '\232', '\305', '\210', '\036', 'N', '\n', 'L', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\026', '\n', '\017', 'r', 'o', 'u', 't', 'e', '_', 's', +'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\021', '\n', '\017', 's', 't', 'r', 'i', 'p', '_', 'p', 'o', +'r', 't', '_', 'm', 'o', 'd', 'e', 'J', '\004', '\010', '\033', '\020', '\034', 'J', '\004', '\010', '\013', '\020', '\014', 'R', '\014', 'i', 'd', 'l', 'e', +'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\"', '\312', '\001', '\n', '\020', 'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', +'n', 'f', 'i', 'g', '\022', 'e', '\n', '\007', 'm', 'a', 'p', 'p', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', -'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', -'n', 'a', 'g', 'e', 'r', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\357', '\001', '\n', 'I', 'i', 'o', '.', 'e', 'n', 'v', 'o', -'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', +'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'M', 'a', 'p', 'p', 'e', 'r', 'R', '\007', +'m', 'a', 'p', 'p', 'e', 'r', 's', '\022', 'O', '\n', '\013', 'b', 'o', 'd', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', +'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', +'g', 'R', '\n', 'b', 'o', 'd', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\234', '\003', '\n', '\016', 'R', 'e', 's', 'p', 'o', 'n', 's', +'e', 'M', 'a', 'p', 'p', 'e', 'r', '\022', 'L', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', +'3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', +'\020', '\001', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'J', '\n', '\013', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', +'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'R', +'\n', 's', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\003', ' ', '\001', '(', '\013', +'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', +'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', 'd', 'y', '\022', '`', '\n', '\024', 'b', 'o', 'd', 'y', '_', 'f', +'o', 'r', 'm', 'a', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'u', 'b', 's', 't', 'i', +'t', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'R', '\022', 'b', 'o', 'd', 'y', 'F', +'o', 'r', 'm', 'a', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'X', '\n', '\016', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', +'t', 'o', '_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', +'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', +'A', 'd', 'd', '\"', '\307', '\001', '\n', '\003', 'R', 'd', 's', '\022', 'Q', '\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', +'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\014', 'c', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '*', '\n', '\021', 'r', 'o', +'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'r', 'o', +'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'N', 'a', 'm', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', +'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', +'2', '.', 'R', 'd', 's', '\"', '\367', '\001', '\n', '\035', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', +'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'y', '\n', '\033', 's', 'c', 'o', 'p', 'e', 'd', '_', +'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', '(', +'\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', +'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\031', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', +'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', +'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', +'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'s', 'L', 'i', 's', 't', '\"', '\345', '\016', '\n', '\014', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', '\033', '\n', +'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', +'e', '\022', '\217', '\001', '\n', '\021', 's', 'c', 'o', 'p', 'e', '_', 'k', 'e', 'y', '_', 'b', 'u', 'i', 'l', 'd', 'e', 'r', '\030', '\002', +' ', '\001', '(', '\013', '2', 'Y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', 'B', '\032', 'H', 't', 't', 'p', 'C', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '|', 'g', 'i', -'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', -'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', -'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'n', 'e', 't', 'w', 'o', 'r', 'k', '/', 'h', 't', 't', 'p', '_', -'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '/', 'v', '3', ';', 'h', 't', 't', -'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', 'v', '3', '\272', '\200', '\310', -'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', +'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\017', 's', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', 'N', '\n', +'\021', 'r', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', +'\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', +'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\017', 'r', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', +'c', 'e', '\022', '\245', '\001', '\n', ' ', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', +'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '_', 'l', 'i', 's', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', +'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', +'t', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', +'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', +'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', 'H', '\000', 'R', '\035', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', +'t', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'g', '\n', '\n', 's', +'c', 'o', 'p', 'e', 'd', '_', 'r', 'd', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', +'.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', +'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'H', '\000', 'R', '\t', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', +'\032', '\337', '\t', '\n', '\017', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\221', '\001', '\n', '\t', +'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'i', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', +'.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', +'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', +'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', +'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\t', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\032', '\333', '\007', '\n', '\017', 'F', 'r', +'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\266', '\001', '\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', +'v', 'a', 'l', 'u', 'e', '_', 'e', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '~', '.', 'e', +'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', +'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', +'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', +'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', +'d', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'H', +'\000', 'R', '\024', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\032', '\225', +'\005', '\n', '\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\022', '!', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', +'\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '+', '\n', '\021', 'e', 'l', 'e', 'm', 'e', 'n', 't', '_', 's', 'e', 'p', 'a', 'r', +'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\020', 'e', 'l', 'e', 'm', 'e', 'n', 't', 'S', 'e', 'p', 'a', 'r', 'a', +'t', 'o', 'r', '\022', '\026', '\n', '\005', 'i', 'n', 'd', 'e', 'x', '\030', '\003', ' ', '\001', '(', '\r', 'H', '\000', 'R', '\005', 'i', 'n', 'd', +'e', 'x', '\022', '\245', '\001', '\n', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\210', '\001', '.', 'e', +'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', +'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', +'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', +'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', +'d', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '.', +'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', 'H', '\000', 'R', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\032', '\333', '\001', '\n', '\t', +'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', '\022', '%', '\n', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\030', '\001', ' ', +'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\022', '\031', +'\n', '\003', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', +':', '\213', '\001', '\232', '\305', '\210', '\036', '\205', '\001', '\n', '\202', '\001', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', +'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', +'m', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', +'t', 'r', 'a', 'c', 't', 'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', ':', '\177', '\232', '\305', '\210', '\036', 'z', '\n', +'x', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', +'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', +'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', +'.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'B', '\016', '\n', '\014', +'e', 'x', 't', 'r', 'a', 'c', 't', '_', 't', 'y', 'p', 'e', ':', 'j', '\232', '\305', '\210', '\036', 'e', '\n', 'c', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', +'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', +'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', +'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\013', '\n', '\004', 't', +'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', ':', 'Z', '\232', '\305', '\210', '\036', 'U', '\n', 'S', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', +'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', +':', 'J', '\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', +'t', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', +'s', 'B', '\027', '\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', +'\001', '\"', '\361', '\001', '\n', '\t', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\022', 'e', '\n', '\030', 's', 'c', 'o', 'p', 'e', 'd', +'_', 'r', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', +'\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', +'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\025', 's', 'c', 'o', +'p', 'e', 'd', 'R', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '4', '\n', '\026', 's', 'r', 'd', +'s', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', +'R', '\024', 's', 'r', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', ':', 'G', '\232', +'\305', '\210', '\036', 'B', '\n', '@', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', +'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', +'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\"', '\350', '\002', '\n', '\n', +'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'X', +'\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', +'+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\017', 'c', 'o', +'n', 'f', 'i', 'g', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', +'n', 'a', 'l', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\022', '\032', '\n', '\010', +'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', +'H', '\232', '\305', '\210', '\036', 'C', '\n', 'A', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', +'\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\002', '\020', '\003', +'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\237', '\001', '\n', '\022', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', +'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', +'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'P', '\232', '\305', '\210', '\036', 'K', '\n', 'I', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', +'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', +'2', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\216', '\001', '\n', ' ', +'E', 'n', 'v', 'o', 'y', 'M', 'o', 'b', 'i', 'l', 'e', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', 'j', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 'R', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', +'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', +'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'M', 'a', 'n', 'a', 'g', 'e', 'r', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\357', '\001', '\n', 'I', 'i', 'o', '.', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', 'B', '\032', 'H', 't', 't', 'p', 'C', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '|', +'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', +'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'n', 'e', 't', 'w', 'o', 'r', 'k', '/', 'h', 't', 't', +'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '/', 'v', '3', ';', 'h', +'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', 'v', '3', '\272', +'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[23] = { @@ -601,5 +603,5 @@ _upb_DefPool_Init envoy_extensions_filters_network_http_connection_manager_v3_ht deps, &envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout, "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto", - UPB_STRINGVIEW_INIT(descriptor, 13438) + UPB_STRINGVIEW_INIT(descriptor, 13490) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c index 8245d7f2be..660411ac66 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c @@ -20,7 +20,7 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4252] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', +static const char descriptor[4439] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', ')', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', @@ -108,7 +108,7 @@ static const char descriptor[4252] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', ' 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', '#', '\n', '\r', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\014', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'n', 'a', 'm', 'e', -'\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\"', '\244', +'\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\"', '\306', '\002', '\n', '\025', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'o', '\n', '\010', 's', 'a', 'n', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', 'H', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', @@ -117,80 +117,87 @@ static const char descriptor[4252] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', ' '\001', ' ', '\000', 'R', '\007', 's', 'a', 'n', 'T', 'y', 'p', 'e', '\022', 'H', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', -'\020', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\"', 'P', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', -'\024', 'S', 'A', 'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', -'\n', '\005', 'E', 'M', 'A', 'I', 'L', '\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', -'\020', '\003', '\022', '\016', '\n', '\n', 'I', 'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\"', '\220', '\014', '\n', '\034', 'C', 'e', +'\020', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\020', '\n', '\003', 'o', 'i', 'd', '\030', '\003', ' ', '\001', '(', '\t', 'R', +'\003', 'o', 'i', 'd', '\"', '`', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', '\024', 'S', 'A', 'N', '_', 'T', 'Y', +'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'E', 'M', 'A', 'I', 'L', +'\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', '\020', '\003', '\022', '\016', '\n', '\n', 'I', +'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\022', '\016', '\n', '\n', 'O', 'T', 'H', 'E', 'R', '_', 'N', 'A', 'M', 'E', +'\020', '\005', '\"', '\251', '\r', '\n', '\034', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', +'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'W', '\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', 'a', '\030', +'\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', +'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', +'\255', '\001', '\n', ' ', 'c', 'a', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', +'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', '\r', ' ', '\001', '(', '\013', '2', 'L', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', +'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', +'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', +'\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', 'C', 'e', +'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', +'\022', '\203', '\001', '\n', '\021', 's', 'y', 's', 't', 'e', 'm', '_', 'r', 'o', 'o', 't', '_', 'c', 'e', 'r', 't', 's', '\030', '\021', ' ', +'\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', -'t', '\022', 'W', '\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', -'o', 'u', 'r', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', -'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', '\255', '\001', '\n', ' ', 'c', 'a', '_', 'c', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', -'c', 'e', '\030', '\r', ' ', '\001', '(', '\013', '2', 'L', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'t', '.', 'S', 'y', 's', 't', 'e', 'm', 'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', 'R', '\017', 's', 'y', 's', 't', 'e', 'm', +'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 'e', +'c', 't', 'o', 'r', 'y', '\030', '\013', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', +'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'F', '\n', '\027', 'v', 'e', +'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'p', 'k', 'i', '\030', '\003', ' ', '\003', +'(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', 'R', '\025', 'v', 'e', 'r', 'i', 'f', +'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', '\n', '\027', 'v', 'e', 'r', 'i', 'f', +'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', '\030', '\002', ' ', '\003', '(', '\t', 'B', +'\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', 'e', 'r', 'i', 'f', 'y', 'C', 'e', +'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', 'a', 's', 'h', '\022', '\202', '\001', '\n', '\035', 'm', 'a', 't', 'c', 'h', '_', 't', +'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 's', '\030', '\017', ' ', +'\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'u', +'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\031', 'm', 'a', 't', 'c', +'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', '\022', 'h', '\n', '\027', +'m', 'a', 't', 'c', 'h', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 's', '\030', '\t', +' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', +'.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', +'e', 's', '\022', 'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', 'e', 'd', '_', 'c', 'e', 'r', 't', +'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', '\006', ' ', '\001', '(', '\013', '2', '\032', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', +'e', 'R', '!', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', +'t', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', '\030', '\007', ' ', '\001', '(', '\013', '2', +' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', +'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', 'l', 'l', 'o', 'w', '_', 'e', 'x', +'p', 'i', 'r', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\027', +'a', 'l', 'l', 'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', '\242', +'\001', '\n', '\030', 't', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', +'o', 'n', '\030', '\n', ' ', '\001', '(', '\016', '2', '^', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', -'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', -'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', -'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', -'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', -'e', 'd', '_', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\013', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', -'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', -'y', '\022', 'F', '\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', -'p', 'k', 'i', '\030', '\003', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', -'R', '\025', 'v', 'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', -'\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', -'\030', '\002', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', -'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', 'a', 's', 'h', '\022', '\202', '\001', '\n', '\035', -'m', 'a', 't', 'c', 'h', '_', 't', 'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', -'a', 'm', 'e', 's', '\030', '\017', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', -'s', '.', 'v', '3', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', -'r', 'R', '\031', 'm', 'a', 't', 'c', 'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', -'m', 'e', 's', '\022', 'h', '\n', '\027', 'm', 'a', 't', 'c', 'h', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', -'n', 'a', 'm', 'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', -'t', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', '\022', 'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', -'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', -'\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', -'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '!', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', -'\030', '\007', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', -'l', 'l', 'o', 'w', '_', 'e', 'x', 'p', 'i', 'r', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', -'\010', ' ', '\001', '(', '\010', 'R', '\027', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', '\022', '\242', '\001', '\n', '\030', 't', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', -'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\n', ' ', '\001', '(', '\016', '2', '^', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', -'t', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', -'d', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', -'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', -'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', 'b', '\n', '\027', 'c', -'u', 's', 't', 'o', 'm', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', -'\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 'c', -'u', 's', 't', 'o', 'm', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', -'n', 'l', 'y', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', -'\016', ' ', '\001', '(', '\010', 'R', '\025', 'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', -'C', 'r', 'l', '\022', 'O', '\n', '\020', 'm', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\030', '\020', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', -'r', 'i', 'f', 'y', 'D', 'e', 'p', 't', 'h', '\"', 'F', '\n', '\026', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', -'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\022', 'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', 'S', -'T', '_', 'C', 'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', 'U', -'S', 'T', 'E', 'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', -'t', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\027', -'v', 'e', 'r', 'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', '\250', -'\001', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', -'s', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'V', -'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', -'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', -'s', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', -'l', 's', '/', 'v', '3', ';', 't', 'l', 's', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', +'o', 'n', 't', 'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', +'t', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', +'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', 'b', '\n', '\027', 'c', 'u', 's', 't', 'o', 'm', '_', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', '\001', '(', '\013', '2', '*', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', +'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 'c', 'u', 's', 't', 'o', 'm', 'V', 'a', +'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', 'n', 'l', 'y', '_', 'v', 'e', 'r', +'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\025', +'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', 'C', 'r', 'l', '\022', 'O', '\n', '\020', +'m', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\030', '\020', ' ', '\001', '(', '\013', '2', '\034', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', +'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', 'r', 'i', 'f', 'y', 'D', 'e', 'p', +'t', 'h', '\032', '\021', '\n', '\017', 'S', 'y', 's', 't', 'e', 'm', 'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\"', 'F', '\n', '\026', +'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', +'\022', 'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', 'S', 'T', '_', 'C', 'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', +'A', 'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', 'U', 'S', 'T', 'E', 'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', +'\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', +'\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', +'t', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', '\250', '\001', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', +'s', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', +'m', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'V', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', +'/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', +'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', ';', 't', 'l', 's', 'v', '3', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[12] = { @@ -212,5 +219,5 @@ _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefi deps, &envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout, "envoy/extensions/transport_sockets/tls/v3/common.proto", - UPB_STRINGVIEW_INIT(descriptor, 4252) + UPB_STRINGVIEW_INIT(descriptor, 4439) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h index 7fc6f5d793..ad7fddf34e 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h @@ -53,6 +53,11 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Certi return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext"); } +UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/deps/grpc/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c index a20340c53c..22d52355f6 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c @@ -10,46 +10,52 @@ #include "envoy/type/matcher/v3/string.upb_minitable.h" extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit; +extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[811] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', +static const char descriptor[901] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', -'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', -'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', -'\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', -'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', -'d', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\321', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', -'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 'e', 'x', 'a', -'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', -'\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\030', '\003', ' ', -'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\022', 'N', '\n', -'\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', -'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', -'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', -'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', -'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', -'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', -'\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', -'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', -'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', -'\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', -'\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', -'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', -'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', -'\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', -'.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', -'.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', -'t', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', -'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', -'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', -'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', -'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'x', 'd', 's', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', +'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', +'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', +'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\216', '\003', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', +'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', +'\005', 'e', 'x', 'a', 'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', +'x', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', +'x', '\022', 'N', '\n', '\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '#', '.', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', +'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', +'e', 'R', 'e', 'g', 'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', ';', '\n', '\006', 'c', +'u', 's', 't', 'o', 'm', '\030', '\010', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\006', +'c', 'u', 's', 't', 'o', 'm', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', +'(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', +'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', +'t', 'c', 'h', 'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', +'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', +'t', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', +'\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', +'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', +'\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', +'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', +'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', +'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', +'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', +';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', +'3', }; -static _upb_DefPool_Init *deps[5] = { +static _upb_DefPool_Init *deps[6] = { &envoy_type_matcher_v3_regex_proto_upbdefinit, + &xds_core_v3_extension_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -60,5 +66,5 @@ _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit = { deps, &envoy_type_matcher_v3_string_proto_upb_file_layout, "envoy/type/matcher/v3/string.proto", - UPB_STRINGVIEW_INIT(descriptor, 811) + UPB_STRINGVIEW_INIT(descriptor, 901) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c index d664aa3531..a973925933 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c @@ -12,13 +12,13 @@ extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_empty_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit; -static const char descriptor[3089] = {'\n', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', +static const char descriptor[3124] = {'\n', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'e', 'm', 'p', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\"', '\367', '\003', '\n', '\013', 'C', 'h', 'e', 'c', 'k', 'e', +'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\"', '\232', '\004', '\n', '\013', 'C', 'h', 'e', 'c', 'k', 'e', 'd', 'E', 'x', 'p', 'r', '\022', '\\', '\n', '\r', 'r', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', '_', 'm', 'a', 'p', '\030', '\002', ' ', '\003', '(', '\013', '2', '7', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 'k', 'e', 'd', 'E', 'x', 'p', 'r', '.', 'R', 'e', 'f', 'e', 'r', 'e', 'n', @@ -29,113 +29,114 @@ static const char descriptor[3089] = {'\n', '&', 'g', 'o', 'o', 'g', 'l', 'e', ' 'M', 'a', 'p', '\022', 'E', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\005', ' ', '\001', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\022', -'2', '\n', '\004', 'e', 'x', 'p', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', -'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\004', 'e', 'x', 'p', -'r', '\032', 'd', '\n', '\021', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', -'\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '9', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', -'\002', ' ', '\001', '(', '\013', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', -'1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', -'\002', '8', '\001', '\032', 'Z', '\n', '\014', 'T', 'y', 'p', 'e', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', -'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '4', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', -'(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', -'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', '\310', '\013', '\n', '\004', -'T', 'y', 'p', 'e', '\022', '*', '\n', '\003', 'd', 'y', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\003', 'd', 'y', 'n', '\022', '0', -'\n', '\004', 'n', 'u', 'l', 'l', '\030', '\002', ' ', '\001', '(', '\016', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\004', 'n', 'u', 'l', 'l', '\022', 'L', -'\n', '\t', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', '\030', '\003', ' ', '\001', '(', '\016', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', -'P', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\t', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', -'e', '\022', 'H', '\n', '\007', 'w', 'r', 'a', 'p', 'p', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\016', '2', ',', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', -'.', 'P', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\007', 'w', 'r', 'a', 'p', 'p', 'e', 'r', -'\022', 'M', '\n', '\n', 'w', 'e', 'l', 'l', '_', 'k', 'n', 'o', 'w', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', ',', '.', 'g', 'o', -'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', -'p', 'e', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\t', 'w', 'e', 'l', 'l', 'K', -'n', 'o', 'w', 'n', '\022', 'F', '\n', '\t', 'l', 'i', 's', 't', '_', 't', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\'', +'!', '\n', '\014', 'e', 'x', 'p', 'r', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\013', 'e', 'x', +'p', 'r', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '2', '\n', '\004', 'e', 'x', 'p', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', -'.', 'T', 'y', 'p', 'e', '.', 'L', 'i', 's', 't', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\010', 'l', 'i', 's', 't', 'T', 'y', 'p', -'e', '\022', 'C', '\n', '\010', 'm', 'a', 'p', '_', 't', 'y', 'p', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', +'.', 'E', 'x', 'p', 'r', 'R', '\004', 'e', 'x', 'p', 'r', '\032', 'd', '\n', '\021', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', 'M', +'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', +'\022', '9', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'R', 'e', 'f', 'e', 'r', 'e', 'n', +'c', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', 'Z', '\n', '\014', 'T', 'y', 'p', 'e', 'M', 'a', 'p', 'E', +'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '4', '\n', +'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', +'.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', +'e', ':', '\002', '8', '\001', '\"', '\310', '\013', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '*', '\n', '\003', 'd', 'y', 'n', '\030', '\001', ' ', '\001', +'(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', +'y', 'H', '\000', 'R', '\003', 'd', 'y', 'n', '\022', '0', '\n', '\004', 'n', 'u', 'l', 'l', '\030', '\002', ' ', '\001', '(', '\016', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', +'H', '\000', 'R', '\004', 'n', 'u', 'l', 'l', '\022', 'L', '\n', '\t', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', '\030', '\003', ' ', '\001', +'(', '\016', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', +'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'P', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', 'p', 'e', 'H', '\000', +'R', '\t', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', '\022', 'H', '\n', '\007', 'w', 'r', 'a', 'p', 'p', 'e', 'r', '\030', '\004', ' ', +'\001', '(', '\016', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', +'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'P', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', 'p', 'e', 'H', +'\000', 'R', '\007', 'w', 'r', 'a', 'p', 'p', 'e', 'r', '\022', 'M', '\n', '\n', 'w', 'e', 'l', 'l', '_', 'k', 'n', 'o', 'w', 'n', '\030', +'\005', ' ', '\001', '(', '\016', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', +'1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', +'e', 'H', '\000', 'R', '\t', 'w', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', '\022', 'F', '\n', '\t', 'l', 'i', 's', 't', '_', 't', 'y', +'p', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\'', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', +'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'L', 'i', 's', 't', 'T', 'y', 'p', 'e', 'H', +'\000', 'R', '\010', 'l', 'i', 's', 't', 'T', 'y', 'p', 'e', '\022', 'C', '\n', '\010', 'm', 'a', 'p', '_', 't', 'y', 'p', 'e', '\030', '\007', +' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', +'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'M', 'a', 'p', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\007', 'm', 'a', +'p', 'T', 'y', 'p', 'e', '\022', 'I', '\n', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', '2', '+', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', +'.', 'T', 'y', 'p', 'e', '.', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\010', 'f', 'u', 'n', +'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\014', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\t', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\n', 't', 'y', 'p', 'e', +'_', 'p', 'a', 'r', 'a', 'm', '\030', '\n', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\t', 't', 'y', 'p', 'e', 'P', 'a', 'r', 'a', 'm', +'\022', '4', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', +'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\004', +'t', 'y', 'p', 'e', '\022', '.', '\n', '\005', 'e', 'r', 'r', 'o', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\005', 'e', 'r', 'r', +'o', 'r', '\022', 'R', '\n', '\r', 'a', 'b', 's', 't', 'r', 'a', 'c', 't', '_', 't', 'y', 'p', 'e', '\030', '\016', ' ', '\001', '(', '\013', +'2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', +'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'A', 'b', 's', 't', 'r', 'a', 'c', 't', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\014', 'a', +'b', 's', 't', 'r', 'a', 'c', 't', 'T', 'y', 'p', 'e', '\032', 'G', '\n', '\010', 'L', 'i', 's', 't', 'T', 'y', 'p', 'e', '\022', ';', +'\n', '\t', 'e', 'l', 'e', 'm', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', +'\010', 'e', 'l', 'e', 'm', 'T', 'y', 'p', 'e', '\032', '\203', '\001', '\n', '\007', 'M', 'a', 'p', 'T', 'y', 'p', 'e', '\022', '9', '\n', '\010', +'k', 'e', 'y', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', +'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\007', 'k', 'e', +'y', 'T', 'y', 'p', 'e', '\022', '=', '\n', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', +'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\t', 'v', 'a', 'l', 'u', 'e', 'T', 'y', 'p', 'e', '\032', '\214', '\001', '\n', '\014', 'F', 'u', +'n', 'c', 't', 'i', 'o', 'n', 'T', 'y', 'p', 'e', '\022', '?', '\n', '\013', 'r', 'e', 's', 'u', 'l', 't', '_', 't', 'y', 'p', 'e', +'\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', +'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\n', 'r', 'e', 's', 'u', 'l', 't', 'T', 'y', 'p', 'e', +'\022', ';', '\n', '\t', 'a', 'r', 'g', '_', 't', 'y', 'p', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', -'e', '.', 'M', 'a', 'p', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\007', 'm', 'a', 'p', 'T', 'y', 'p', 'e', '\022', 'I', '\n', '\010', 'f', -'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', -'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'F', 'u', 'n', 'c', -'t', 'i', 'o', 'n', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\014', 'm', -'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\t', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 'm', 'e', 's', 's', -'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\n', 't', 'y', 'p', 'e', '_', 'p', 'a', 'r', 'a', 'm', '\030', '\n', ' ', '\001', -'(', '\t', 'H', '\000', 'R', '\t', 't', 'y', 'p', 'e', 'P', 'a', 'r', 'a', 'm', '\022', '4', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\013', -' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', -'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\004', 't', 'y', 'p', 'e', '\022', '.', '\n', '\005', 'e', 'r', -'r', 'o', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\005', 'e', 'r', 'r', 'o', 'r', '\022', 'R', '\n', '\r', 'a', 'b', 's', 't', -'r', 'a', 'c', 't', '_', 't', 'y', 'p', 'e', '\030', '\016', ' ', '\001', '(', '\013', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', '.', 'A', 'b', -'s', 't', 'r', 'a', 'c', 't', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\014', 'a', 'b', 's', 't', 'r', 'a', 'c', 't', 'T', 'y', 'p', -'e', '\032', 'G', '\n', '\010', 'L', 'i', 's', 't', 'T', 'y', 'p', 'e', '\022', ';', '\n', '\t', 'e', 'l', 'e', 'm', '_', 't', 'y', 'p', -'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', -'.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\010', 'e', 'l', 'e', 'm', 'T', 'y', 'p', 'e', '\032', -'\203', '\001', '\n', '\007', 'M', 'a', 'p', 'T', 'y', 'p', 'e', '\022', '9', '\n', '\010', 'k', 'e', 'y', '_', 't', 'y', 'p', 'e', '\030', '\001', -' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', -'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\007', 'k', 'e', 'y', 'T', 'y', 'p', 'e', '\022', '=', '\n', '\n', 'v', -'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\t', 'v', -'a', 'l', 'u', 'e', 'T', 'y', 'p', 'e', '\032', '\214', '\001', '\n', '\014', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'T', 'y', 'p', 'e', -'\022', '?', '\n', '\013', 'r', 'e', 's', 'u', 'l', 't', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', -'y', 'p', 'e', 'R', '\n', 'r', 'e', 's', 'u', 'l', 't', 'T', 'y', 'p', 'e', '\022', ';', '\n', '\t', 'a', 'r', 'g', '_', 't', 'y', -'p', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', -'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\010', 'a', 'r', 'g', 'T', 'y', 'p', 'e', -'s', '\032', 'k', '\n', '\014', 'A', 'b', 's', 't', 'r', 'a', 'c', 't', 'T', 'y', 'p', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'G', '\n', '\017', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', -'_', 't', 'y', 'p', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', -'.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\016', 'p', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', 'T', 'y', 'p', 'e', 's', '\"', 's', '\n', '\r', 'P', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', -'p', 'e', '\022', '\036', '\n', '\032', 'P', 'R', 'I', 'M', 'I', 'T', 'I', 'V', 'E', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', -'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\010', '\n', '\004', 'B', 'O', 'O', 'L', '\020', '\001', '\022', '\t', '\n', '\005', 'I', 'N', -'T', '6', '4', '\020', '\002', '\022', '\n', '\n', '\006', 'U', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\n', '\n', '\006', 'D', 'O', 'U', 'B', -'L', 'E', '\020', '\004', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\005', '\022', '\t', '\n', '\005', 'B', 'Y', 'T', 'E', 'S', -'\020', '\006', '\"', 'V', '\n', '\r', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\033', 'W', 'E', -'L', 'L', '_', 'K', 'N', 'O', 'W', 'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', -'\020', '\000', '\022', '\007', '\n', '\003', 'A', 'N', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', 'T', 'I', 'M', 'E', 'S', 'T', 'A', 'M', 'P', '\020', -'\002', '\022', '\014', '\n', '\010', 'D', 'U', 'R', 'A', 'T', 'I', 'O', 'N', '\020', '\003', 'B', '\013', '\n', '\t', 't', 'y', 'p', 'e', '_', 'k', -'i', 'n', 'd', '\"', '\263', '\005', '\n', '\004', 'D', 'e', 'c', 'l', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', -'\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '@', '\n', '\005', 'i', 'd', 'e', 'n', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', -'D', 'e', 'c', 'l', '.', 'I', 'd', 'e', 'n', 't', 'D', 'e', 'c', 'l', 'H', '\000', 'R', '\005', 'i', 'd', 'e', 'n', 't', '\022', 'I', -'\n', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'D', 'e', 'c', 'l', '.', 'F', -'u', 'n', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'c', 'l', 'H', '\000', 'R', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\032', '\213', -'\001', '\n', '\t', 'I', 'd', 'e', 'n', 't', 'D', 'e', 'c', 'l', '\022', '2', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', -'\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', -'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', '8', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', -' ', '\001', '(', '\013', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', -'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '\020', '\n', -'\003', 'd', 'o', 'c', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\003', 'd', 'o', 'c', '\032', '\356', '\002', '\n', '\014', 'F', 'u', 'n', 'c', 't', -'i', 'o', 'n', 'D', 'e', 'c', 'l', '\022', 'R', '\n', '\t', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\030', '\001', ' ', '\003', '(', -'\013', '2', '4', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', -'h', 'a', '1', '.', 'D', 'e', 'c', 'l', '.', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'c', 'l', '.', 'O', 'v', 'e', -'r', 'l', 'o', 'a', 'd', 'R', '\t', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\032', '\211', '\002', '\n', '\010', 'O', 'v', 'e', 'r', -'l', 'o', 'a', 'd', '\022', '\037', '\n', '\013', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', -'R', '\n', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'I', 'd', '\022', '6', '\n', '\006', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\002', ' ', -'\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', -'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\006', 'p', 'a', 'r', 'a', 'm', 's', '\022', '\037', '\n', '\013', 't', 'y', 'p', -'e', '_', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 't', 'y', 'p', 'e', 'P', 'a', 'r', 'a', 'm', -'s', '\022', '?', '\n', '\013', 'r', 'e', 's', 'u', 'l', 't', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', +'e', 'R', '\010', 'a', 'r', 'g', 'T', 'y', 'p', 'e', 's', '\032', 'k', '\n', '\014', 'A', 'b', 's', 't', 'r', 'a', 'c', 't', 'T', 'y', +'p', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'G', '\n', +'\017', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '_', 't', 'y', 'p', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', -'T', 'y', 'p', 'e', 'R', '\n', 'r', 'e', 's', 'u', 'l', 't', 'T', 'y', 'p', 'e', '\022', '0', '\n', '\024', 'i', 's', '_', 'i', 'n', -'s', 't', 'a', 'n', 'c', 'e', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\022', 'i', 's', -'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '\020', '\n', '\003', 'd', 'o', 'c', '\030', '\006', -' ', '\001', '(', '\t', 'R', '\003', 'd', 'o', 'c', 'B', '\013', '\n', '\t', 'd', 'e', 'c', 'l', '_', 'k', 'i', 'n', 'd', '\"', 'z', '\n', -'\t', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', -'\004', 'n', 'a', 'm', 'e', '\022', '\037', '\n', '\013', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'i', 'd', '\030', '\003', ' ', '\003', '(', -'\t', 'R', '\n', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'I', 'd', '\022', '8', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', -'\001', '(', '\013', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', -'l', 'p', 'h', 'a', '1', '.', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'B', 'l', '\n', '\034', -'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', -'h', 'a', '1', 'B', '\t', 'D', 'e', 'c', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', -'e', 'a', 'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', -'x', 'p', 'r', '\370', '\001', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'T', 'y', 'p', 'e', 'R', '\016', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'T', 'y', 'p', 'e', 's', '\"', 's', '\n', '\r', 'P', +'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 'T', 'y', 'p', 'e', '\022', '\036', '\n', '\032', 'P', 'R', 'I', 'M', 'I', 'T', 'I', 'V', 'E', +'_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\010', '\n', '\004', 'B', 'O', +'O', 'L', '\020', '\001', '\022', '\t', '\n', '\005', 'I', 'N', 'T', '6', '4', '\020', '\002', '\022', '\n', '\n', '\006', 'U', 'I', 'N', 'T', '6', '4', +'\020', '\003', '\022', '\n', '\n', '\006', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\004', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', +'\005', '\022', '\t', '\n', '\005', 'B', 'Y', 'T', 'E', 'S', '\020', '\006', '\"', 'V', '\n', '\r', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', +'T', 'y', 'p', 'e', '\022', '\037', '\n', '\033', 'W', 'E', 'L', 'L', '_', 'K', 'N', 'O', 'W', 'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', +'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\007', '\n', '\003', 'A', 'N', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', +'T', 'I', 'M', 'E', 'S', 'T', 'A', 'M', 'P', '\020', '\002', '\022', '\014', '\n', '\010', 'D', 'U', 'R', 'A', 'T', 'I', 'O', 'N', '\020', '\003', +'B', '\013', '\n', '\t', 't', 'y', 'p', 'e', '_', 'k', 'i', 'n', 'd', '\"', '\263', '\005', '\n', '\004', 'D', 'e', 'c', 'l', '\022', '\022', '\n', +'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '@', '\n', '\005', 'i', 'd', 'e', 'n', +'t', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', +'.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'D', 'e', 'c', 'l', '.', 'I', 'd', 'e', 'n', 't', 'D', 'e', 'c', 'l', 'H', +'\000', 'R', '\005', 'i', 'd', 'e', 'n', 't', '\022', 'I', '\n', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', +'\013', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', +'h', 'a', '1', '.', 'D', 'e', 'c', 'l', '.', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'c', 'l', 'H', '\000', 'R', '\010', +'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\032', '\213', '\001', '\n', '\t', 'I', 'd', 'e', 'n', 't', 'D', 'e', 'c', 'l', '\022', '2', '\n', +'\004', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', +'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', +'8', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', +'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', +'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '\020', '\n', '\003', 'd', 'o', 'c', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\003', 'd', 'o', 'c', +'\032', '\356', '\002', '\n', '\014', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'c', 'l', '\022', 'R', '\n', '\t', 'o', 'v', 'e', 'r', +'l', 'o', 'a', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '4', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', +'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'D', 'e', 'c', 'l', '.', 'F', 'u', 'n', 'c', 't', 'i', +'o', 'n', 'D', 'e', 'c', 'l', '.', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'R', '\t', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', +'s', '\032', '\211', '\002', '\n', '\010', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\022', '\037', '\n', '\013', 'o', 'v', 'e', 'r', 'l', 'o', 'a', +'d', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'I', 'd', '\022', '6', '\n', +'\006', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', +'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\006', 'p', 'a', 'r', +'a', 'm', 's', '\022', '\037', '\n', '\013', 't', 'y', 'p', 'e', '_', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', +'\n', 't', 'y', 'p', 'e', 'P', 'a', 'r', 'a', 'm', 's', '\022', '?', '\n', '\013', 'r', 'e', 's', 'u', 'l', 't', '_', 't', 'y', 'p', +'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', +'.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'T', 'y', 'p', 'e', 'R', '\n', 'r', 'e', 's', 'u', 'l', 't', 'T', 'y', 'p', +'e', '\022', '0', '\n', '\024', 'i', 's', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', +'\030', '\005', ' ', '\001', '(', '\010', 'R', '\022', 'i', 's', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'F', 'u', 'n', 'c', 't', 'i', 'o', +'n', '\022', '\020', '\n', '\003', 'd', 'o', 'c', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\003', 'd', 'o', 'c', 'B', '\013', '\n', '\t', 'd', 'e', +'c', 'l', '_', 'k', 'i', 'n', 'd', '\"', 'z', '\n', '\t', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', '\022', '\022', '\n', '\004', 'n', +'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\037', '\n', '\013', 'o', 'v', 'e', 'r', 'l', 'o', +'a', 'd', '_', 'i', 'd', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'I', 'd', '\022', '8', +'\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', +'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', 'R', +'\005', 'v', 'a', 'l', 'u', 'e', 'B', 'l', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', +'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', 'B', '\t', 'D', 'e', 'c', 'l', 'P', 'r', 'o', 't', 'o', 'P', +'\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', +'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', +'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', 'x', 'p', 'r', '\370', '\001', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[4] = { @@ -149,5 +150,5 @@ _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit = { deps, &google_api_expr_v1alpha1_checked_proto_upb_file_layout, "google/api/expr/v1alpha1/checked.proto", - UPB_STRINGVIEW_INIT(descriptor, 3089) + UPB_STRINGVIEW_INIT(descriptor, 3124) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c index 1bc7aafdd3..bdf128c4c3 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c @@ -12,7 +12,7 @@ extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_timestamp_proto_upbdefinit; -static const char descriptor[3059] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', +static const char descriptor[3637] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', @@ -23,8 +23,8 @@ static const char descriptor[3059] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', ' 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\004', 'e', 'x', 'p', 'r', '\022', 'E', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\003', ' ', '\001', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', -'.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\"', '\334', -'\014', '\n', '\004', 'E', 'x', 'p', 'r', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\002', 'i', 'd', '\022', 'C', +'.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\"', '\313', +'\r', '\n', '\004', 'E', 'x', 'p', 'r', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\002', 'i', 'd', '\022', 'C', '\n', '\n', 'c', 'o', 'n', 's', 't', '_', 'e', 'x', 'p', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', 'H', '\000', 'R', '\t', 'c', 'o', 'n', 's', 't', 'E', 'x', 'p', 'r', '\022', 'E', '\n', '\n', 'i', 'd', 'e', 'n', @@ -57,84 +57,107 @@ static const char descriptor[3059] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', ' 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\006', 't', 'a', 'r', 'g', 'e', 't', '\022', '\032', '\n', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '2', '\n', '\004', 'a', 'r', 'g', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', -'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\004', 'a', 'r', 'g', 's', '\032', 'H', '\n', +'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\004', 'a', 'r', 'g', 's', '\032', 's', '\n', '\n', 'C', 'r', 'e', 'a', 't', 'e', 'L', 'i', 's', 't', '\022', ':', '\n', '\010', 'e', 'l', 'e', 'm', 'e', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', -'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\010', 'e', 'l', 'e', 'm', 'e', 'n', 't', 's', '\032', '\264', '\002', '\n', -'\014', 'C', 'r', 'e', 'a', 't', 'e', 'S', 't', 'r', 'u', 'c', 't', '\022', '!', '\n', '\014', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', -'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'N', 'a', 'm', 'e', '\022', 'K', -'\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', '.', 'C', 'r', -'e', 'a', 't', 'e', 'S', 't', 'r', 'u', 'c', 't', '.', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', -'\032', '\263', '\001', '\n', '\005', 'E', 'n', 't', 'r', 'y', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\002', 'i', -'d', '\022', '\035', '\n', '\t', 'f', 'i', 'e', 'l', 'd', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\010', 'f', -'i', 'e', 'l', 'd', 'K', 'e', 'y', '\022', '9', '\n', '\007', 'm', 'a', 'p', '_', 'k', 'e', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', +'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\010', 'e', 'l', 'e', 'm', 'e', 'n', 't', 's', '\022', ')', '\n', '\020', +'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '_', 'i', 'n', 'd', 'i', 'c', 'e', 's', '\030', '\002', ' ', '\003', '(', '\005', 'R', '\017', 'o', +'p', 't', 'i', 'o', 'n', 'a', 'l', 'I', 'n', 'd', 'i', 'c', 'e', 's', '\032', '\333', '\002', '\n', '\014', 'C', 'r', 'e', 'a', 't', 'e', +'S', 't', 'r', 'u', 'c', 't', '\022', '!', '\n', '\014', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', +'\001', '(', '\t', 'R', '\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'N', 'a', 'm', 'e', '\022', 'K', '\n', '\007', 'e', 'n', 't', 'r', 'i', +'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', +'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', '.', 'C', 'r', 'e', 'a', 't', 'e', 'S', 't', 'r', +'u', 'c', 't', '.', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\032', '\332', '\001', '\n', '\005', 'E', 'n', +'t', 'r', 'y', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\002', 'i', 'd', '\022', '\035', '\n', '\t', 'f', 'i', +'e', 'l', 'd', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\010', 'f', 'i', 'e', 'l', 'd', 'K', 'e', 'y', +'\022', '9', '\n', '\007', 'm', 'a', 'p', '_', 'k', 'e', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'H', +'\000', 'R', '\006', 'm', 'a', 'p', 'K', 'e', 'y', '\022', '4', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', -'1', '.', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\006', 'm', 'a', 'p', 'K', 'e', 'y', '\022', '4', '\n', '\005', 'v', 'a', 'l', 'u', 'e', -'\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', -'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'B', '\n', '\n', '\010', 'k', -'e', 'y', '_', 'k', 'i', 'n', 'd', '\032', '\375', '\002', '\n', '\r', 'C', 'o', 'm', 'p', 'r', 'e', 'h', 'e', 'n', 's', 'i', 'o', 'n', -'\022', '\031', '\n', '\010', 'i', 't', 'e', 'r', '_', 'v', 'a', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'i', 't', 'e', 'r', 'V', -'a', 'r', '\022', '=', '\n', '\n', 'i', 't', 'e', 'r', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', +'1', '.', 'E', 'x', 'p', 'r', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '%', '\n', '\016', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', +'_', 'e', 'n', 't', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\r', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', 'E', 'n', 't', +'r', 'y', 'B', '\n', '\n', '\010', 'k', 'e', 'y', '_', 'k', 'i', 'n', 'd', '\032', '\232', '\003', '\n', '\r', 'C', 'o', 'm', 'p', 'r', 'e', +'h', 'e', 'n', 's', 'i', 'o', 'n', '\022', '\031', '\n', '\010', 'i', 't', 'e', 'r', '_', 'v', 'a', 'r', '\030', '\001', ' ', '\001', '(', '\t', +'R', '\007', 'i', 't', 'e', 'r', 'V', 'a', 'r', '\022', '\033', '\n', '\t', 'i', 't', 'e', 'r', '_', 'v', 'a', 'r', '2', '\030', '\010', ' ', +'\001', '(', '\t', 'R', '\010', 'i', 't', 'e', 'r', 'V', 'a', 'r', '2', '\022', '=', '\n', '\n', 'i', 't', 'e', 'r', '_', 'r', 'a', 'n', +'g', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', +'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\t', 'i', 't', 'e', 'r', 'R', 'a', 'n', 'g', +'e', '\022', '\031', '\n', '\010', 'a', 'c', 'c', 'u', '_', 'v', 'a', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 'a', 'c', 'c', 'u', +'V', 'a', 'r', '\022', ';', '\n', '\t', 'a', 'c', 'c', 'u', '_', 'i', 'n', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', -'E', 'x', 'p', 'r', 'R', '\t', 'i', 't', 'e', 'r', 'R', 'a', 'n', 'g', 'e', '\022', '\031', '\n', '\010', 'a', 'c', 'c', 'u', '_', 'v', -'a', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 'a', 'c', 'c', 'u', 'V', 'a', 'r', '\022', ';', '\n', '\t', 'a', 'c', 'c', 'u', -'_', 'i', 'n', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', -'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\010', 'a', 'c', 'c', 'u', 'I', -'n', 'i', 't', '\022', 'E', '\n', '\016', 'l', 'o', 'o', 'p', '_', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', -'(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', -'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\r', 'l', 'o', 'o', 'p', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', -';', '\n', '\t', 'l', 'o', 'o', 'p', '_', 's', 't', 'e', 'p', '\030', '\006', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', -'R', '\010', 'l', 'o', 'o', 'p', 'S', 't', 'e', 'p', '\022', '6', '\n', '\006', 'r', 'e', 's', 'u', 'l', 't', '\030', '\007', ' ', '\001', '(', -'\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', -'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\006', 'r', 'e', 's', 'u', 'l', 't', 'B', '\013', '\n', '\t', 'e', 'x', 'p', 'r', '_', -'k', 'i', 'n', 'd', '\"', '\301', '\003', '\n', '\010', 'C', 'o', 'n', 's', 't', 'a', 'n', 't', '\022', ';', '\n', '\n', 'n', 'u', 'l', 'l', -'_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\t', 'n', 'u', 'l', 'l', 'V', 'a', -'l', 'u', 'e', '\022', '\037', '\n', '\n', 'b', 'o', 'o', 'l', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'H', '\000', -'R', '\t', 'b', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\013', 'i', 'n', 't', '6', '4', '_', 'v', 'a', 'l', 'u', -'e', '\030', '\003', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\n', 'i', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', -'u', 'i', 'n', 't', '6', '4', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\004', 'H', '\000', 'R', '\013', 'u', 'i', 'n', -'t', '6', '4', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', -'\005', ' ', '\001', '(', '\001', 'H', '\000', 'R', '\013', 'd', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', -'t', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', -'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\013', 'b', 'y', 't', 'e', 's', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', -'\001', '(', '\014', 'H', '\000', 'R', '\n', 'b', 'y', 't', 'e', 's', 'V', 'a', 'l', 'u', 'e', '\022', 'F', '\n', '\016', 'd', 'u', 'r', 'a', -'t', 'i', 'o', 'n', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\002', '\030', '\001', 'H', '\000', 'R', -'\r', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'V', 'a', 'l', 'u', 'e', '\022', 'I', '\n', '\017', 't', 'i', 'm', 'e', 's', 't', 'a', -'m', 'p', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'B', '\002', '\030', '\001', 'H', '\000', 'R', '\016', -'t', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'V', 'a', 'l', 'u', 'e', 'B', '\017', '\n', '\r', 'c', 'o', 'n', 's', 't', 'a', 'n', -'t', '_', 'k', 'i', 'n', 'd', '\"', '\271', '\003', '\n', '\n', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\022', '%', '\n', '\016', -'s', 'y', 'n', 't', 'a', 'x', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\r', 's', 'y', 'n', -'t', 'a', 'x', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', -'\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '!', '\n', '\014', 'l', 'i', 'n', 'e', '_', 'o', 'f', 'f', -'s', 'e', 't', 's', '\030', '\003', ' ', '\003', '(', '\005', 'R', '\013', 'l', 'i', 'n', 'e', 'O', 'f', 'f', 's', 'e', 't', 's', '\022', 'Q', -'\n', '\t', 'p', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '3', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', -'e', 'I', 'n', 'f', 'o', '.', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\t', 'p', 'o', 's', -'i', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\013', 'm', 'a', 'c', 'r', 'o', '_', 'c', 'a', 'l', 'l', 's', '\030', '\005', ' ', '\003', -'(', '\013', '2', '4', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', -'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '.', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', -'s', 'E', 'n', 't', 'r', 'y', 'R', '\n', 'm', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', '\032', '<', '\n', '\016', 'P', 'o', 's', -'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', -'\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\005', 'v', 'a', 'l', 'u', -'e', ':', '\002', '8', '\001', '\032', ']', '\n', '\017', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', 'E', 'n', 't', 'r', 'y', '\022', -'\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '4', '\n', '\005', 'v', 'a', 'l', 'u', -'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', -'.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', -'\"', 'p', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'l', 'o', 'c', -'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', -'o', 'f', 'f', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'o', 'f', 'f', 's', 'e', 't', '\022', '\022', '\n', '\004', 'l', -'i', 'n', 'e', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\004', 'l', 'i', 'n', 'e', '\022', '\026', '\n', '\006', 'c', 'o', 'l', 'u', 'm', 'n', -'\030', '\004', ' ', '\001', '(', '\005', 'R', '\006', 'c', 'o', 'l', 'u', 'm', 'n', 'B', 'n', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', 'B', '\013', 'S', 'y', -'n', 't', 'a', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', -'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', -'/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', 'x', 'p', 'r', '\370', '\001', -'\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'E', 'x', 'p', 'r', 'R', '\010', 'a', 'c', 'c', 'u', 'I', 'n', 'i', 't', '\022', 'E', '\n', '\016', 'l', 'o', 'o', 'p', '_', 'c', 'o', +'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', +'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\r', 'l', 'o', 'o', +'p', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', ';', '\n', '\t', 'l', 'o', 'o', 'p', '_', 's', 't', 'e', 'p', '\030', '\006', +' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', +'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\010', 'l', 'o', 'o', 'p', 'S', 't', 'e', 'p', '\022', '6', '\n', '\006', +'r', 'e', 's', 'u', 'l', 't', '\030', '\007', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', +'.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\006', 'r', 'e', 's', 'u', +'l', 't', 'B', '\013', '\n', '\t', 'e', 'x', 'p', 'r', '_', 'k', 'i', 'n', 'd', '\"', '\301', '\003', '\n', '\010', 'C', 'o', 'n', 's', 't', +'a', 'n', 't', '\022', ';', '\n', '\n', 'n', 'u', 'l', 'l', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\032', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', +'e', 'H', '\000', 'R', '\t', 'n', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\n', 'b', 'o', 'o', 'l', '_', 'v', 'a', +'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'b', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', +'\013', 'i', 'n', 't', '6', '4', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\n', 'i', 'n', 't', +'6', '4', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 'u', 'i', 'n', 't', '6', '4', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', +' ', '\001', '(', '\004', 'H', '\000', 'R', '\013', 'u', 'i', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 'd', 'o', +'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\001', 'H', '\000', 'R', '\013', 'd', 'o', 'u', 'b', 'l', +'e', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', +'\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\013', 'b', 'y', 't', +'e', 's', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\n', 'b', 'y', 't', 'e', 's', 'V', 'a', +'l', 'u', 'e', '\022', 'F', '\n', '\016', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'B', '\002', '\030', '\001', 'H', '\000', 'R', '\r', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'V', 'a', 'l', 'u', 'e', +'\022', 'I', '\n', '\017', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\t', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', +'a', 'm', 'p', 'B', '\002', '\030', '\001', 'H', '\000', 'R', '\016', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'V', 'a', 'l', 'u', 'e', +'B', '\017', '\n', '\r', 'c', 'o', 'n', 's', 't', 'a', 'n', 't', '_', 'k', 'i', 'n', 'd', '\"', '\214', '\007', '\n', '\n', 'S', 'o', 'u', +'r', 'c', 'e', 'I', 'n', 'f', 'o', '\022', '%', '\n', '\016', 's', 'y', 'n', 't', 'a', 'x', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', +'\030', '\001', ' ', '\001', '(', '\t', 'R', '\r', 's', 'y', 'n', 't', 'a', 'x', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\032', '\n', '\010', +'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', +'!', '\n', '\014', 'l', 'i', 'n', 'e', '_', 'o', 'f', 'f', 's', 'e', 't', 's', '\030', '\003', ' ', '\003', '(', '\005', 'R', '\013', 'l', 'i', +'n', 'e', 'O', 'f', 'f', 's', 'e', 't', 's', '\022', 'Q', '\n', '\t', 'p', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', +'\003', '(', '\013', '2', '3', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', +'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '.', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', +'s', 'E', 'n', 't', 'r', 'y', 'R', '\t', 'p', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\013', 'm', 'a', 'c', 'r', +'o', '_', 'c', 'a', 'l', 'l', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '4', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', +'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', +'o', '.', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', 'E', 'n', 't', 'r', 'y', 'R', '\n', 'm', 'a', 'c', 'r', 'o', 'C', +'a', 'l', 'l', 's', '\022', 'N', '\n', '\n', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', +'.', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', +'1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', '\n', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\032', '\200', '\003', '\n', '\t', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '\016', +'\n', '\002', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\002', 'i', 'd', '\022', 'i', '\n', '\023', 'a', 'f', 'f', 'e', 'c', 't', 'e', +'d', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '\030', '\002', ' ', '\003', '(', '\016', '2', '8', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', +'c', 'e', 'I', 'n', 'f', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', +'t', 'R', '\022', 'a', 'f', 'f', 'e', 'c', 't', 'e', 'd', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '\022', 'P', '\n', '\007', +'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', +'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', +'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\007', 'v', 'e', 'r', 's', +'i', 'o', 'n', '\032', '5', '\n', '\007', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'm', 'a', 'j', 'o', 'r', '\030', '\001', +' ', '\001', '(', '\003', 'R', '\005', 'm', 'a', 'j', 'o', 'r', '\022', '\024', '\n', '\005', 'm', 'i', 'n', 'o', 'r', '\030', '\002', ' ', '\001', '(', +'\003', 'R', '\005', 'm', 'i', 'n', 'o', 'r', '\"', 'o', '\n', '\t', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', '\022', '\031', '\n', '\025', +'C', 'O', 'M', 'P', 'O', 'N', 'E', 'N', 'T', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\024', +'\n', '\020', 'C', 'O', 'M', 'P', 'O', 'N', 'E', 'N', 'T', '_', 'P', 'A', 'R', 'S', 'E', 'R', '\020', '\001', '\022', '\032', '\n', '\026', 'C', +'O', 'M', 'P', 'O', 'N', 'E', 'N', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'C', 'H', 'E', 'C', 'K', 'E', 'R', '\020', '\002', '\022', '\025', +'\n', '\021', 'C', 'O', 'M', 'P', 'O', 'N', 'E', 'N', 'T', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '\032', '<', '\n', '\016', +'P', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', +'(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\005', 'v', +'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', ']', '\n', '\017', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', 'E', 'n', 't', +'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '4', '\n', '\005', 'v', +'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', +'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', +'\002', '8', '\001', '\"', 'p', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', '\022', '\032', '\n', '\010', +'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', +'\026', '\n', '\006', 'o', 'f', 'f', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'o', 'f', 'f', 's', 'e', 't', '\022', '\022', +'\n', '\004', 'l', 'i', 'n', 'e', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\004', 'l', 'i', 'n', 'e', '\022', '\026', '\n', '\006', 'c', 'o', 'l', +'u', 'm', 'n', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\006', 'c', 'o', 'l', 'u', 'm', 'n', 'B', 'n', '\n', '\034', 'c', 'o', 'm', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', 'B', +'\013', 'S', 'y', 'n', 't', 'a', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', +'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', +'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', 'x', 'p', +'r', '\370', '\001', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[4] = { @@ -148,5 +171,5 @@ _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit = { deps, &google_api_expr_v1alpha1_syntax_proto_upb_file_layout, "google/api/expr/v1alpha1/syntax.proto", - UPB_STRINGVIEW_INIT(descriptor, 3059) + UPB_STRINGVIEW_INIT(descriptor, 3637) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h index f176e5ef52..f2c9ce3912 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h @@ -73,6 +73,16 @@ UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourceInfo_getmsgdef(u return upb_DefPool_FindMessageByName(s, "google.api.expr.v1alpha1.SourceInfo"); } +UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourceInfo_Extension_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &google_api_expr_v1alpha1_syntax_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "google.api.expr.v1alpha1.SourceInfo.Extension"); +} + +UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourceInfo_Extension_Version_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &google_api_expr_v1alpha1_syntax_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "google.api.expr.v1alpha1.SourceInfo.Extension.Version"); +} + UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourceInfo_PositionsEntry_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &google_api_expr_v1alpha1_syntax_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "google.api.expr.v1alpha1.SourceInfo.PositionsEntry"); diff --git a/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c b/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c index 52e7e29cbc..47d0623437 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c +++ b/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c @@ -9,7 +9,7 @@ #include "google/protobuf/descriptor.upbdefs.h" #include "google/protobuf/descriptor.upb_minitable.h" -static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +static const char descriptor[12268] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', '\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', @@ -172,7 +172,7 @@ static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', -'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\227', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\255', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 'v', 'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', @@ -219,262 +219,287 @@ static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', '\014', 'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', -'\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', -'t', 'i', 'o', 'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', -'_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', -'s', 'a', 'g', 'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', -'t', 'a', 'n', 'd', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', -'o', 'r', '\030', '\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', -'r', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', -'\001', '(', '\010', 'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', -'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', -'l', 'i', 'c', 't', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', -'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', -'s', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', -'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', -'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', -'\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', -'\020', '\007', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\255', '\n', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', -'n', 's', '.', 'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', -'\n', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', -'\006', 'j', 's', 't', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', -'e', ':', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', -'a', 'z', 'y', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', -'\017', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', -'a', 'l', 's', 'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', -'f', 'a', 'l', 's', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', -'c', 't', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', -'a', 'c', 't', '\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', +'\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'', 'R', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', +'s', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o', +'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g', +'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n', +'d', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030', +'\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010', +'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', +'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', +'t', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', +'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', +'\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', +'t', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', +'t', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', +'\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', +'\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', +'\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\235', '\r', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', +'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', +'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', +'t', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', +'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', +'\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', +'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', +'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', +'s', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', +'\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', +'\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', +'.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', +'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', +'.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't', +'s', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003', +'(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', +'d', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017', +'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', +'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'U', '\n', +'\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', '\030', '\026', ' ', '\001', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', -'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', -'n', 't', 'i', 'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', -'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', -'g', 'e', 't', 's', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', -'\024', ' ', '\003', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', -'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', -'t', 'R', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', -'t', 'u', 'r', 'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', -'\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', -'\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', -'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', 'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', +'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', +'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', +'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', +'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', +'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', +'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', +'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\032', '\226', '\002', '\n', '\016', 'F', 'e', 'a', 't', +'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'i', 'n', 't', +'r', 'o', 'd', 'u', 'c', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'I', 'n', +'t', 'r', 'o', 'd', 'u', 'c', 'e', 'd', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'p', 'r', 'e', +'c', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '/', '\n', '\023', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '_', 'w', 'a', 'r', +'n', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\022', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', 'W', 'a', +'r', 'n', 'i', 'n', 'g', '\022', 'A', '\n', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '\030', +'\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', +'d', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'R', 'e', 'm', 'o', 'v', 'e', 'd', '\"', '/', '\n', +'\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', +'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', +'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', +'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', +'\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R', +'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T', +'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N', +'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T', +'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', +'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', +'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T', +'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', +'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', +'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', +'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', +'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', +'\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', +'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', +'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', +'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', +'\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', +'\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', +'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', +'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', +'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', +'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(', +'\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', +'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', +'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', +'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', +'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\330', '\002', +'\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', +'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', +'R', 'e', 'd', 'a', 'c', 't', '\022', 'U', '\n', '\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', +'\030', '\004', ' ', '\001', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', +'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', +'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', +'$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', +'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', +'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', +'\030', '\"', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', +'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', +'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', +'\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', +'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', +'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', +'s', '.', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', +'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', +'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', +'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', +'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', +'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', +'t', 'i', 'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', +'\027', '\n', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', +'\023', '\n', '\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', +'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', +'\n', '\023', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', +'n', 'a', 'm', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', +'a', 'm', 'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', +'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', +'r', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', +'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', +'u', 'e', '\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', +'\005', ' ', '\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', +'\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', +'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', +'\007', ' ', '\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', +'r', 'e', 'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', +'g', 'a', 't', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', +'n', 'a', 'm', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', +'\022', '!', '\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', +'s', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\247', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', +'\022', '\221', '\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', +'2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '?', '\210', '\001', '\001', '\230', '\001', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\346', '\007', '\242', '\001', '\r', '\022', '\010', +'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', +'\350', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'l', +'\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', +'m', 'T', 'y', 'p', 'e', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', +'E', 'D', '\030', '\346', '\007', '\242', '\001', '\t', '\022', '\004', 'O', 'P', 'E', 'N', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\010', +'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\230', '\001', '\n', '\027', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', +'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', +'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '-', '\210', '\001', '\001', '\230', '\001', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', +'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', +'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '~', '\n', '\017', 'u', 't', 'f', '8', '_', 'v', 'a', 'l', +'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', 'f', '8', 'V', 'a', 'l', +'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\t', '\022', '\004', 'N', 'O', +'N', 'E', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', +'R', '\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '~', '\n', '\020', 'm', 'e', 's', 's', 'a', +'g', 'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', +'s', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '&', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', +'\024', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\346', '\007', '\262', '\001', '\003', '\010', +'\350', '\007', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\202', '\001', '\n', '\013', 'j', +'s', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', +'F', 'o', 'r', 'm', 'a', 't', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', +'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\346', '\007', '\242', '\001', '\n', '\022', +'\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', +'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', +'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', +'\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', +'\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', +'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', 'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', +'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', +'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', +'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', +'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', +'\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\020', '\002', '\"', 'I', '\n', '\016', 'U', 't', 'f', '8', 'V', +'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', +'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', +'\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"', '\004', '\010', '\001', '\020', '\001', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 'a', +'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 'C', +'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 'H', +'_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', '\020', +'\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'F', +'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', +'\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', '\002', +'*', '\006', '\010', '\350', '\007', '\020', '\213', 'N', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J', +'\006', '\010', '\347', '\007', '\020', '\350', '\007', '\"', '\357', '\003', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', +'a', 'u', 'l', 't', 's', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', +'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', +'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm', +'i', 'n', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i', +'n', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e', +'d', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i', +'t', 'i', 'o', 'n', '\032', '\370', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', -'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', -'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', -'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', -'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', -'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', -'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', '\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', -'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', -'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', -'\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', -'\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', -'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', -'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', -'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T', 'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', -'\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', -'\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', -'\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', -'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', -'\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', -'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', -'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', -'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', -'m', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', -' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', -'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', -'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', -'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', -'\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', -'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', -'t', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', -'\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', -'\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', -'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', -'\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\201', '\002', '\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', -'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', -'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', -'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', -'(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', -'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', -'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', 'e', 'r', -'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\"', -' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', -'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', -'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', -'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', -'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', -'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', -'\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', -'s', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', -'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', 'p', 'o', -'t', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', -'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', -'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', -'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', '2', '\033', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', -'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', -'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', -'\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', -'\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', -'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', -'m', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', -'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', -'_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', -'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', -'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', -'\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', -'\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', -'d', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', -'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', -'\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', -'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', -'t', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', -'m', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', -'\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\214', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '\022', '\213', -'\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', ')', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', -'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\004', '\230', -'\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\346', '\007', '\242', '\001', '\r', '\022', '\010', 'I', 'M', -'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\350', '\007', -'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'f', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', -'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 'B', '#', '\210', -'\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\t', -'\022', '\004', 'O', 'P', 'E', 'N', '\030', '\347', '\007', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\222', '\001', '\n', '\027', 'r', -'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', 'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', -'\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', -'t', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', -'d', 'i', 'n', 'g', 'B', '\'', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', -'D', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', 'R', '\025', 'r', 'e', 'p', -'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', 'x', '\n', '\017', 'u', 't', 'f', -'8', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', -'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', '#', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', -'\t', '\022', '\004', 'N', 'O', 'N', 'E', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', 'R', -'\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'x', '\n', '\020', 'm', 'e', 's', 's', 'a', 'g', -'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', 's', -'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', ' ', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\024', -'\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\346', '\007', 'R', '\017', 'm', 'e', 's', -'s', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '|', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', -'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'B', '3', -'\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', -'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\346', '\007', '\242', '\001', '\n', '\022', '\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', -'\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', -'s', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', 'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', -'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', -'\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', '\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', -'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', -'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', -'\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', -'d', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', -'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', -'\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', -'\020', '\002', '\"', 'C', '\n', '\016', 'U', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', -'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', -'\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"', 'S', '\n', '\017', -'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', -'E', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', -'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', -'I', 'T', 'E', 'D', '\020', '\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', -'S', 'O', 'N', '_', 'F', 'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', -'L', 'L', 'O', 'W', '\020', '\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', -'O', 'R', 'T', '\020', '\002', '*', '\006', '\010', '\350', '\007', '\020', '\351', '\007', '*', '\006', '\010', '\351', '\007', '\020', '\352', '\007', '*', '\006', '\010', '\352', -'\007', '\020', '\353', '\007', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J', '\006', '\010', '\347', '\007', -'\020', '\350', '\007', '\"', '\376', '\002', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', -'s', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', -'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', -'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm', 'i', 'n', 'i', 'm', -'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i', 'n', 'i', 'm', 'u', -'m', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', -'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', -'\032', '\207', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', -'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', -'d', 'i', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', -'\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', -'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', -'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', -'2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', -'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', -'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', -' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', -'\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', -'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', -'m', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', -'t', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', -'s', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', -'m', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', -'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', -'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', -'\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', -'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', -'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', -'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', -'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', 'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', -'\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', -'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', -'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', -'s', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', -'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', -'*', '\222', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', -'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', -'2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', -'\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', -'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', -'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', -'\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', -'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', -'\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', -'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', -'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', -'c', 't', 'i', 'o', 'n', +'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'N', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'a', 'b', 'l', 'e', +'_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\023', 'o', 'v', 'e', 'r', +'r', 'i', 'd', 'a', 'b', 'l', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'B', '\n', '\016', 'f', 'i', 'x', 'e', 'd', '_', +'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\r', 'f', 'i', 'x', 'e', 'd', +'F', 'e', 'a', 't', 'u', 'r', 'e', 's', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\010', 'f', 'e', 'a', +'t', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', +'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', +'.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', +'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', +'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', +'\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', +'\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', +'\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', +'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', +'d', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', +'\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', +'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', +'\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', +'d', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', +'t', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', +'t', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', +'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', +'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', +'\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', 'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', +'t', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', +'\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', +'\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\247', '\002', '\n', '\007', 'E', 'd', 'i', +'t', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', +'\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', '\020', '\204', '\007', '\022', '\023', '\n', '\016', +'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', +'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', +'2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', +'\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', +'\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', +'\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', +'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', +'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', +'9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', +'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', +'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', +'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +'t', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', }; static _upb_DefPool_Init *deps[1] = { @@ -485,5 +510,5 @@ _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = { deps, &google_protobuf_descriptor_proto_upb_file_layout, "google/protobuf/descriptor.proto", - UPB_STRINGVIEW_INIT(descriptor, 11630) + UPB_STRINGVIEW_INIT(descriptor, 12268) }; diff --git a/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h b/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h index 3b99df4b83..9a488b575f 100644 --- a/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h +++ b/deps/grpc/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h @@ -108,6 +108,11 @@ UPB_INLINE const upb_MessageDef *google_protobuf_FieldOptions_EditionDefault_get return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldOptions.EditionDefault"); } +UPB_INLINE const upb_MessageDef *google_protobuf_FieldOptions_FeatureSupport_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldOptions.FeatureSupport"); +} + UPB_INLINE const upb_MessageDef *google_protobuf_OneofOptions_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "google.protobuf.OneofOptions"); diff --git a/deps/grpc/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/deps/grpc/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 7db1842d5d..153eddbeec 100644 --- a/deps/grpc/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/deps/grpc/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -17,7 +17,9 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include +#include +#include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include @@ -38,17 +40,17 @@ namespace { class EndpointInfoHandshaker : public Handshaker { public: - const char* name() const override { return "endpoint_info"; } + absl::string_view name() const override { return "endpoint_info"; } - void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override { + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override { args->args = args->args .Set(GRPC_ARG_ENDPOINT_LOCAL_ADDRESS, - grpc_endpoint_get_local_address(args->endpoint)) + grpc_endpoint_get_local_address(args->endpoint.get())) .Set(GRPC_ARG_ENDPOINT_PEER_ADDRESS, - grpc_endpoint_get_peer(args->endpoint)); - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, absl::OkStatus()); + grpc_endpoint_get_peer(args->endpoint.get())); + InvokeOnHandshakeDone(args, std::move(on_handshake_done), absl::OkStatus()); } void Shutdown(grpc_error_handle /*why*/) override {} diff --git a/deps/grpc/src/core/handshaker/handshaker.cc b/deps/grpc/src/core/handshaker/handshaker.cc index 4279755cb6..3949dccbe5 100644 --- a/deps/grpc/src/core/handshaker/handshaker.cc +++ b/deps/grpc/src/core/handshaker/handshaker.cc @@ -23,38 +23,54 @@ #include #include +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include #include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/status_helper.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +using ::grpc_event_engine::experimental::EventEngine; + namespace grpc_core { -namespace { +void Handshaker::InvokeOnHandshakeDone( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done, + absl::Status status) { + args->event_engine->Run([on_handshake_done = std::move(on_handshake_done), + status = std::move(status)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + on_handshake_done(std::move(status)); + // Destroy callback while ExecCtx is still in scope. + on_handshake_done = nullptr; + }); +} -using ::grpc_event_engine::experimental::EventEngine; +namespace { std::string HandshakerArgsString(HandshakerArgs* args) { - size_t read_buffer_length = - args->read_buffer != nullptr ? args->read_buffer->length : 0; - return absl::StrFormat( - "{endpoint=%p, args=%s, read_buffer=%p (length=%" PRIuPTR - "), exit_early=%d}", - args->endpoint, args->args.ToString(), args->read_buffer, - read_buffer_length, args->exit_early); + return absl::StrFormat("{endpoint=%p, args=%s, read_buffer.Length()=%" PRIuPTR + ", exit_early=%d}", + args->endpoint.get(), args->args.ToString(), + args->read_buffer.Length(), args->exit_early); } } // namespace @@ -65,159 +81,122 @@ HandshakeManager::HandshakeManager() void HandshakeManager::Add(RefCountedPtr handshaker) { MutexLock lock(&mu_); - if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log( - GPR_INFO, - "handshake_manager %p: adding handshaker %s [%p] at index %" PRIuPTR, - this, handshaker->name(), handshaker.get(), handshakers_.size()); - } + GRPC_TRACE_LOG(handshaker, INFO) + << "handshake_manager " << this << ": adding handshaker " + << std::string(handshaker->name()) << " [" << handshaker.get() + << "] at index " << handshakers_.size(); handshakers_.push_back(std::move(handshaker)); } -HandshakeManager::~HandshakeManager() { handshakers_.clear(); } +void HandshakeManager::DoHandshake( + OrphanablePtr endpoint, const ChannelArgs& channel_args, + Timestamp deadline, grpc_tcp_server_acceptor* acceptor, + absl::AnyInvocable)> + on_handshake_done) { + // We hold a ref until after the mutex is released, because we might + // wind up invoking on_handshake_done in another thread before we + // return from this function, and on_handshake_done might release the + // last ref to this object. + auto self = Ref(); + MutexLock lock(&mu_); + CHECK_EQ(index_, 0u); + on_handshake_done_ = std::move(on_handshake_done); + // Construct handshaker args. These will be passed through all + // handshakers and eventually be freed by the on_handshake_done callback. + args_.endpoint = std::move(endpoint); + args_.deadline = deadline; + args_.args = channel_args; + args_.event_engine = args_.args.GetObject(); + args_.acceptor = acceptor; + if (acceptor != nullptr && acceptor->external_connection && + acceptor->pending_data != nullptr) { + grpc_slice_buffer_swap(args_.read_buffer.c_slice_buffer(), + &(acceptor->pending_data->data.raw.slice_buffer)); + // TODO(vigneshbabu): For connections accepted through event engine + // listeners, the ownership of the byte buffer received is transferred to + // this callback and it is thus this callback's duty to delete it. + // Make this hack default once event engine is rolled out. + if (grpc_event_engine::experimental::grpc_is_event_engine_endpoint( + args_.endpoint.get())) { + grpc_byte_buffer_destroy(acceptor->pending_data); + } + } + // Start deadline timer, which owns a ref. + const Duration time_to_deadline = deadline - Timestamp::Now(); + deadline_timer_handle_ = + args_.event_engine->RunAfter(time_to_deadline, [self = Ref()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->Shutdown(GRPC_ERROR_CREATE("Handshake timed out")); + // HandshakeManager deletion might require an active ExecCtx. + self.reset(); + }); + // Start first handshaker. + CallNextHandshakerLocked(absl::OkStatus()); +} -void HandshakeManager::Shutdown(grpc_error_handle why) { - { - MutexLock lock(&mu_); +void HandshakeManager::Shutdown(absl::Status error) { + MutexLock lock(&mu_); + if (!is_shutdown_) { + GRPC_TRACE_LOG(handshaker, INFO) + << "handshake_manager " << this << ": Shutdown() called: " << error; + is_shutdown_ = true; // Shutdown the handshaker that's currently in progress, if any. - if (!is_shutdown_ && index_ > 0) { - is_shutdown_ = true; - handshakers_[index_ - 1]->Shutdown(why); + if (index_ > 0) { + GRPC_TRACE_LOG(handshaker, INFO) + << "handshake_manager " << this + << ": shutting down handshaker at index " << index_ - 1; + handshakers_[index_ - 1]->Shutdown(std::move(error)); } } } -// Helper function to call either the next handshaker or the -// on_handshake_done callback. -// Returns true if we've scheduled the on_handshake_done callback. -bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log(GPR_INFO, - "handshake_manager %p: error=%s shutdown=%d index=%" PRIuPTR - ", args=%s", - this, StatusToString(error).c_str(), is_shutdown_, index_, - HandshakerArgsString(&args_).c_str()); - } +void HandshakeManager::CallNextHandshakerLocked(absl::Status error) { + GRPC_TRACE_LOG(handshaker, INFO) + << "handshake_manager " << this << ": error=" << error + << " shutdown=" << is_shutdown_ << " index=" << index_ + << ", args=" << HandshakerArgsString(&args_); CHECK(index_ <= handshakers_.size()); // If we got an error or we've been shut down or we're exiting early or // we've finished the last handshaker, invoke the on_handshake_done - // callback. Otherwise, call the next handshaker. + // callback. if (!error.ok() || is_shutdown_ || args_.exit_early || index_ == handshakers_.size()) { if (error.ok() && is_shutdown_) { error = GRPC_ERROR_CREATE("handshaker shutdown"); - // It is possible that the endpoint has already been destroyed by - // a shutdown call while this callback was sitting on the ExecCtx - // with no error. - if (args_.endpoint != nullptr) { - grpc_endpoint_destroy(args_.endpoint); - args_.endpoint = nullptr; - } - if (args_.read_buffer != nullptr) { - grpc_slice_buffer_destroy(args_.read_buffer); - gpr_free(args_.read_buffer); - args_.read_buffer = nullptr; - } - args_.args = ChannelArgs(); - } - if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log(GPR_INFO, - "handshake_manager %p: handshaking complete -- scheduling " - "on_handshake_done with error=%s", - this, StatusToString(error).c_str()); + args_.endpoint.reset(); } + GRPC_TRACE_LOG(handshaker, INFO) << "handshake_manager " << this + << ": handshaking complete -- scheduling " + "on_handshake_done with error=" + << error; // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. - event_engine_->Cancel(deadline_timer_handle_); - ExecCtx::Run(DEBUG_LOCATION, &on_handshake_done_, error); + args_.event_engine->Cancel(deadline_timer_handle_); is_shutdown_ = true; - } else { - auto handshaker = handshakers_[index_]; - if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log( - GPR_INFO, - "handshake_manager %p: calling handshaker %s [%p] at index %" PRIuPTR, - this, handshaker->name(), handshaker.get(), index_); - } - handshaker->DoHandshake(acceptor_, &call_next_handshaker_, &args_); + absl::StatusOr result(&args_); + if (!error.ok()) result = std::move(error); + args_.event_engine->Run([on_handshake_done = std::move(on_handshake_done_), + result = std::move(result)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + on_handshake_done(std::move(result)); + // Destroy callback while ExecCtx is still in scope. + on_handshake_done = nullptr; + }); + return; } + // Call the next handshaker. + auto handshaker = handshakers_[index_]; + GRPC_TRACE_LOG(handshaker, INFO) + << "handshake_manager " << this << ": calling handshaker " + << handshaker->name() << " [" << handshaker.get() << "] at index " + << index_; ++index_; - return is_shutdown_; -} - -void HandshakeManager::CallNextHandshakerFn(void* arg, - grpc_error_handle error) { - auto* mgr = static_cast(arg); - bool done; - { - MutexLock lock(&mgr->mu_); - done = mgr->CallNextHandshakerLocked(error); - } - // If we're invoked the final callback, we won't be coming back - // to this function, so we can release our reference to the - // handshake manager. - if (done) { - mgr->Unref(); - } -} - -void HandshakeManager::DoHandshake(grpc_endpoint* endpoint, - const ChannelArgs& channel_args, - Timestamp deadline, - grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, - void* user_data) { - bool done; - { - MutexLock lock(&mu_); - CHECK_EQ(index_, 0u); - // Construct handshaker args. These will be passed through all - // handshakers and eventually be freed by the on_handshake_done callback. - args_.endpoint = endpoint; - args_.deadline = deadline; - args_.args = channel_args; - args_.user_data = user_data; - args_.read_buffer = - static_cast(gpr_malloc(sizeof(*args_.read_buffer))); - grpc_slice_buffer_init(args_.read_buffer); - if (acceptor != nullptr && acceptor->external_connection && - acceptor->pending_data != nullptr) { - grpc_slice_buffer_swap(args_.read_buffer, - &(acceptor->pending_data->data.raw.slice_buffer)); - // TODO(vigneshbabu): For connections accepted through event engine - // listeners, the ownership of the byte buffer received is transferred to - // this callback and it is thus this callback's duty to delete it. - // Make this hack default once event engine is rolled out. - if (grpc_event_engine::experimental::grpc_is_event_engine_endpoint( - endpoint)) { - grpc_byte_buffer_destroy(acceptor->pending_data); - } - } - // Initialize state needed for calling handshakers. - acceptor_ = acceptor; - GRPC_CLOSURE_INIT(&call_next_handshaker_, - &HandshakeManager::CallNextHandshakerFn, this, - grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_INIT(&on_handshake_done_, on_handshake_done, &args_, - grpc_schedule_on_exec_ctx); - // Start deadline timer, which owns a ref. - const Duration time_to_deadline = deadline - Timestamp::Now(); - event_engine_ = args_.args.GetObjectRef(); - deadline_timer_handle_ = - event_engine_->RunAfter(time_to_deadline, [self = Ref()]() mutable { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->Shutdown(GRPC_ERROR_CREATE("Handshake timed out")); - // HandshakeManager deletion might require an active ExecCtx. - self.reset(); - }); - // Start first handshaker, which also owns a ref. - Ref().release(); - done = CallNextHandshakerLocked(absl::OkStatus()); - } - if (done) { - Unref(); - } + handshaker->DoHandshake(&args_, [self = Ref()](absl::Status error) mutable { + MutexLock lock(&self->mu_); + self->CallNextHandshakerLocked(std::move(error)); + }); } } // namespace grpc_core diff --git a/deps/grpc/src/core/handshaker/handshaker.h b/deps/grpc/src/core/handshaker/handshaker.h index f5df382408..04beed4a96 100644 --- a/deps/grpc/src/core/handshaker/handshaker.h +++ b/deps/grpc/src/core/handshaker/handshaker.h @@ -31,6 +31,7 @@ #include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" @@ -39,6 +40,7 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/slice/slice_buffer.h" namespace grpc_core { @@ -49,34 +51,35 @@ namespace grpc_core { /// /// In general, handshakers should be used via a handshake manager. -/// Arguments passed through handshakers and to the on_handshake_done callback. +/// Arguments passed through handshakers and back to the caller. /// /// For handshakers, all members are input/output parameters; for /// example, a handshaker may read from or write to \a endpoint and /// then later replace it with a wrapped endpoint. Similarly, a /// handshaker may modify \a args. /// -/// A handshaker takes ownership of the members while a handshake is in -/// progress. Upon failure or shutdown of an in-progress handshaker, -/// the handshaker is responsible for destroying the members and setting -/// them to NULL before invoking the on_handshake_done callback. -/// -/// For the on_handshake_done callback, all members are input arguments, -/// which the callback takes ownership of. +/// A handshaker takes ownership of the members when this struct is +/// passed to DoHandshake(). It passes ownership back to the caller +/// when it invokes on_handshake_done. struct HandshakerArgs { - grpc_endpoint* endpoint = nullptr; + OrphanablePtr endpoint; ChannelArgs args; - grpc_slice_buffer* read_buffer = nullptr; + // Any bytes read from the endpoint that are not consumed by the + // handshaker must be passed back via this buffer. + SliceBuffer read_buffer; // A handshaker may set this to true before invoking on_handshake_done // to indicate that subsequent handshakers should be skipped. bool exit_early = false; - // User data passed through the handshake manager. Not used by - // individual handshakers. - void* user_data = nullptr; + // EventEngine to use for async work. + // (This is just a convenience to avoid digging it out of args.) + grpc_event_engine::experimental::EventEngine* event_engine = nullptr; // Deadline associated with the handshake. // TODO(anramach): Move this out of handshake args after EventEngine // is the default. Timestamp deadline; + // TODO(roth): Make this go away somehow as part of the EventEngine + // migration? + grpc_tcp_server_acceptor* acceptor = nullptr; }; /// @@ -86,11 +89,23 @@ struct HandshakerArgs { class Handshaker : public RefCounted { public: ~Handshaker() override = default; - virtual void Shutdown(grpc_error_handle why) = 0; - virtual void DoHandshake(grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, - HandshakerArgs* args) = 0; - virtual const char* name() const = 0; + virtual absl::string_view name() const = 0; + virtual void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) = 0; + virtual void Shutdown(absl::Status error) = 0; + + protected: + // Helper function to safely invoke on_handshake_done asynchronously. + // + // Note that on_handshake_done may complete in another thread as soon + // as this method returns, so the handshaker object may be destroyed + // by the callback unless the caller of this method is holding its own + // ref to the handshaker. + static void InvokeOnHandshakeDone( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done, + absl::Status status); }; // @@ -100,16 +115,11 @@ class Handshaker : public RefCounted { class HandshakeManager : public RefCounted { public: HandshakeManager(); - ~HandshakeManager() override; /// Adds a handshaker to the handshake manager. /// Takes ownership of \a handshaker. void Add(RefCountedPtr handshaker) ABSL_LOCKS_EXCLUDED(mu_); - /// Shuts down the handshake manager (e.g., to clean up when the operation is - /// aborted in the middle). - void Shutdown(grpc_error_handle why) ABSL_LOCKS_EXCLUDED(mu_); - /// Invokes handshakers in the order they were added. /// Takes ownership of \a endpoint, and then passes that ownership to /// the \a on_handshake_done callback. @@ -122,41 +132,39 @@ class HandshakeManager : public RefCounted { /// absl::OkStatus(), then handshaking failed and the handshaker has done /// the necessary clean-up. Otherwise, the callback takes ownership of /// the arguments. - void DoHandshake(grpc_endpoint* endpoint, const ChannelArgs& channel_args, - Timestamp deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data) - ABSL_LOCKS_EXCLUDED(mu_); + void DoHandshake(OrphanablePtr endpoint, + const ChannelArgs& channel_args, Timestamp deadline, + grpc_tcp_server_acceptor* acceptor, + absl::AnyInvocable)> + on_handshake_done) ABSL_LOCKS_EXCLUDED(mu_); - private: - bool CallNextHandshakerLocked(grpc_error_handle error) - ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + /// Shuts down the handshake manager (e.g., to clean up when the operation is + /// aborted in the middle). + void Shutdown(absl::Status error) ABSL_LOCKS_EXCLUDED(mu_); + private: // A function used as the handshaker-done callback when chaining // handshakers together. - static void CallNextHandshakerFn(void* arg, grpc_error_handle error) - ABSL_LOCKS_EXCLUDED(mu_); + void CallNextHandshakerLocked(absl::Status error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - static const size_t HANDSHAKERS_INIT_SIZE = 2; + static const size_t kHandshakerListInlineSize = 2; Mutex mu_; bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; - // An array of handshakers added via grpc_handshake_manager_add(). - absl::InlinedVector, HANDSHAKERS_INIT_SIZE> - handshakers_ ABSL_GUARDED_BY(mu_); // The index of the handshaker to invoke next and closure to invoke it. size_t index_ ABSL_GUARDED_BY(mu_) = 0; - grpc_closure call_next_handshaker_ ABSL_GUARDED_BY(mu_); - // The acceptor to call the handshakers with. - grpc_tcp_server_acceptor* acceptor_ ABSL_GUARDED_BY(mu_); - // The final callback and user_data to invoke after the last handshaker. - grpc_closure on_handshake_done_ ABSL_GUARDED_BY(mu_); + // An array of handshakers added via Add(). + absl::InlinedVector, kHandshakerListInlineSize> + handshakers_ ABSL_GUARDED_BY(mu_); // Handshaker args. HandshakerArgs args_ ABSL_GUARDED_BY(mu_); + // The final callback to invoke after the last handshaker. + absl::AnyInvocable)> on_handshake_done_ + ABSL_GUARDED_BY(mu_); // Deadline timer across all handshakers. grpc_event_engine::experimental::EventEngine::TaskHandle deadline_timer_handle_ ABSL_GUARDED_BY(mu_); - std::shared_ptr event_engine_ - ABSL_GUARDED_BY(mu_); }; } // namespace grpc_core diff --git a/deps/grpc/src/core/handshaker/http_connect/http_connect_handshaker.cc b/deps/grpc/src/core/handshaker/http_connect/http_connect_handshaker.cc index d9a3ffc384..2260224d10 100644 --- a/deps/grpc/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/deps/grpc/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -23,8 +23,10 @@ #include #include +#include #include "absl/base/thread_annotations.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -33,7 +35,6 @@ #include #include #include -#include #include #include "src/core/handshaker/handshaker.h" @@ -50,6 +51,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/slice/slice_buffer.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/string.h" @@ -61,165 +64,148 @@ namespace { class HttpConnectHandshaker : public Handshaker { public: HttpConnectHandshaker(); - void Shutdown(grpc_error_handle why) override; - void DoHandshake(grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override; - const char* name() const override { return "http_connect"; } + absl::string_view name() const override { return "http_connect"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: ~HttpConnectHandshaker() override; - void CleanupArgsForFailureLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - void HandshakeFailedLocked(grpc_error_handle error) + void HandshakeFailedLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - static void OnWriteDone(void* arg, grpc_error_handle error); - static void OnReadDone(void* arg, grpc_error_handle error); + void FinishLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void OnWriteDone(absl::Status error); + void OnReadDone(absl::Status error); + bool OnReadDoneLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); static void OnWriteDoneScheduler(void* arg, grpc_error_handle error); static void OnReadDoneScheduler(void* arg, grpc_error_handle error); Mutex mu_; - bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; - // Read buffer to destroy after a shutdown. - grpc_slice_buffer* read_buffer_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; - // State saved while performing the handshake. HandshakerArgs* args_ = nullptr; - grpc_closure* on_handshake_done_ = nullptr; + absl::AnyInvocable on_handshake_done_ + ABSL_GUARDED_BY(mu_); // Objects for processing the HTTP CONNECT request and response. - grpc_slice_buffer write_buffer_ ABSL_GUARDED_BY(mu_); - grpc_closure request_done_closure_ ABSL_GUARDED_BY(mu_); - grpc_closure response_read_closure_ ABSL_GUARDED_BY(mu_); + SliceBuffer write_buffer_ ABSL_GUARDED_BY(mu_); + grpc_closure on_write_done_scheduler_ ABSL_GUARDED_BY(mu_); + grpc_closure on_read_done_scheduler_ ABSL_GUARDED_BY(mu_); grpc_http_parser http_parser_ ABSL_GUARDED_BY(mu_); grpc_http_response http_response_ ABSL_GUARDED_BY(mu_); }; HttpConnectHandshaker::~HttpConnectHandshaker() { - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } - grpc_slice_buffer_destroy(&write_buffer_); grpc_http_parser_destroy(&http_parser_); grpc_http_response_destroy(&http_response_); } -// Set args fields to nullptr, saving the endpoint and read buffer for -// later destruction. -void HttpConnectHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error_handle error) { +void HttpConnectHandshaker::HandshakeFailedLocked(absl::Status error) { if (error.ok()) { // If we were shut down after an endpoint operation succeeded but // before the endpoint callback was invoked, we need to generate our // own error. error = GRPC_ERROR_CREATE("Handshaker shutdown"); } - if (!is_shutdown_) { - // Not shutting down, so the handshake failed. Clean up before - // invoking the callback. - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - is_shutdown_ = true; - } // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); + FinishLocked(std::move(error)); +} + +void HttpConnectHandshaker::FinishLocked(absl::Status error) { + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), std::move(error)); } // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnWriteDone on ExecCtx. +// TODO(roth): This hop will no longer be needed when we migrate to the +// EventEngine endpoint API. void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg, grpc_error_handle error) { auto* handshaker = static_cast(arg); - ExecCtx::Run(DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&handshaker->request_done_closure_, - &HttpConnectHandshaker::OnWriteDone, - handshaker, grpc_schedule_on_exec_ctx), - error); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnWriteDone(std::move(error)); + }); } // Callback invoked when finished writing HTTP CONNECT request. -void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error_handle error) { - auto* handshaker = static_cast(arg); - ReleasableMutexLock lock(&handshaker->mu_); - if (!error.ok() || handshaker->is_shutdown_) { +void HttpConnectHandshaker::OnWriteDone(absl::Status error) { + ReleasableMutexLock lock(&mu_); + if (!error.ok() || args_->endpoint == nullptr) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. - handshaker->HandshakeFailedLocked(error); + HandshakeFailedLocked(error); lock.Release(); - handshaker->Unref(); + Unref(); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. grpc_endpoint_read( - handshaker->args_->endpoint, handshaker->args_->read_buffer, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDoneScheduler, - handshaker, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_read_done_scheduler_, + &HttpConnectHandshaker::OnReadDoneScheduler, this, + grpc_schedule_on_exec_ctx), /*urgent=*/true, /*min_progress_size=*/1); } } // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnReadDone on ExecCtx. +// TODO(roth): This hop will no longer be needed when we migrate to the +// EventEngine endpoint API. void HttpConnectHandshaker::OnReadDoneScheduler(void* arg, grpc_error_handle error) { auto* handshaker = static_cast(arg); - ExecCtx::Run(DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDone, handshaker, - grpc_schedule_on_exec_ctx), - error); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnReadDone(std::move(error)); + }); } // Callback invoked for reading HTTP CONNECT response. -void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) { - auto* handshaker = static_cast(arg); - ReleasableMutexLock lock(&handshaker->mu_); - if (!error.ok() || handshaker->is_shutdown_) { +void HttpConnectHandshaker::OnReadDone(absl::Status error) { + bool done; + { + MutexLock lock(&mu_); + done = OnReadDoneLocked(std::move(error)); + } + if (done) Unref(); +} + +bool HttpConnectHandshaker::OnReadDoneLocked(absl::Status error) { + if (!error.ok() || args_->endpoint == nullptr) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. - handshaker->HandshakeFailedLocked(error); - goto done; + HandshakeFailedLocked(std::move(error)); + return true; } // Add buffer to parser. - for (size_t i = 0; i < handshaker->args_->read_buffer->count; ++i) { - if (GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i]) > 0) { + while (args_->read_buffer.Count() > 0) { + Slice slice = args_->read_buffer.TakeFirst(); + if (!slice.empty()) { size_t body_start_offset = 0; - error = grpc_http_parser_parse(&handshaker->http_parser_, - handshaker->args_->read_buffer->slices[i], + error = grpc_http_parser_parse(&http_parser_, slice.c_slice(), &body_start_offset); if (!error.ok()) { - handshaker->HandshakeFailedLocked(error); - goto done; + HandshakeFailedLocked(std::move(error)); + return true; } - if (handshaker->http_parser_.state == GRPC_HTTP_BODY) { + if (http_parser_.state == GRPC_HTTP_BODY) { // Remove the data we've already read from the read buffer, // leaving only the leftover bytes (if any). - grpc_slice_buffer tmp_buffer; - grpc_slice_buffer_init(&tmp_buffer); - if (body_start_offset < - GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i])) { - grpc_slice_buffer_add( - &tmp_buffer, - grpc_slice_split_tail(&handshaker->args_->read_buffer->slices[i], - body_start_offset)); + SliceBuffer tmp_buffer; + if (body_start_offset < slice.length()) { + tmp_buffer.Append(slice.Split(body_start_offset)); } - grpc_slice_buffer_addn(&tmp_buffer, - &handshaker->args_->read_buffer->slices[i + 1], - handshaker->args_->read_buffer->count - i - 1); - grpc_slice_buffer_swap(handshaker->args_->read_buffer, &tmp_buffer); - grpc_slice_buffer_destroy(&tmp_buffer); + tmp_buffer.TakeAndAppend(args_->read_buffer); + tmp_buffer.Swap(&args_->read_buffer); break; } } @@ -235,65 +221,46 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) { // need to fix the HTTP parser to understand when the body is // complete (e.g., handling chunked transfer encoding or looking // at the Content-Length: header). - if (handshaker->http_parser_.state != GRPC_HTTP_BODY) { - grpc_slice_buffer_reset_and_unref(handshaker->args_->read_buffer); + if (http_parser_.state != GRPC_HTTP_BODY) { + args_->read_buffer.Clear(); grpc_endpoint_read( - handshaker->args_->endpoint, handshaker->args_->read_buffer, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDoneScheduler, - handshaker, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_read_done_scheduler_, + &HttpConnectHandshaker::OnReadDoneScheduler, this, + grpc_schedule_on_exec_ctx), /*urgent=*/true, /*min_progress_size=*/1); - return; + return false; } // Make sure we got a 2xx response. - if (handshaker->http_response_.status < 200 || - handshaker->http_response_.status >= 300) { + if (http_response_.status < 200 || http_response_.status >= 300) { error = GRPC_ERROR_CREATE(absl::StrCat("HTTP proxy returned response code ", - handshaker->http_response_.status)); - handshaker->HandshakeFailedLocked(error); - goto done; + http_response_.status)); + HandshakeFailedLocked(std::move(error)); + return true; } // Success. Invoke handshake-done callback. - ExecCtx::Run(DEBUG_LOCATION, handshaker->on_handshake_done_, error); -done: - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - handshaker->is_shutdown_ = true; - lock.Release(); - handshaker->Unref(); + FinishLocked(absl::OkStatus()); + return true; } // // Public handshaker methods // -void HttpConnectHandshaker::Shutdown(grpc_error_handle /*why*/) { - { - MutexLock lock(&mu_); - if (!is_shutdown_) { - is_shutdown_ = true; - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); - } - } +void HttpConnectHandshaker::Shutdown(absl::Status /*error*/) { + MutexLock lock(&mu_); + if (on_handshake_done_ != nullptr) args_->endpoint.reset(); } -void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { +void HttpConnectHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { // Check for HTTP CONNECT channel arg. // If not found, invoke on_handshake_done without doing anything. absl::optional server_name = args->args.GetString(GRPC_ARG_HTTP_CONNECT_SERVER); if (!server_name.has_value()) { - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - { - MutexLock lock(&mu_); - is_shutdown_ = true; - } - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, absl::OkStatus()); + InvokeOnHandshakeDone(args, std::move(on_handshake_done), absl::OkStatus()); return; } // Get headers from channel args. @@ -311,10 +278,9 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, gpr_malloc(sizeof(grpc_http_header) * num_header_strings)); for (size_t i = 0; i < num_header_strings; ++i) { char* sep = strchr(header_strings[i], ':'); - if (sep == nullptr) { - gpr_log(GPR_ERROR, "skipping unparseable HTTP CONNECT header: %s", - header_strings[i]); + LOG(ERROR) << "skipping unparseable HTTP CONNECT header: " + << header_strings[i]; continue; } *sep = '\0'; @@ -326,9 +292,9 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, // Save state in the handshaker object. MutexLock lock(&mu_); args_ = args; - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); // Log connection via proxy. - std::string proxy_name(grpc_endpoint_get_peer(args->endpoint)); + std::string proxy_name(grpc_endpoint_get_peer(args->endpoint.get())); std::string server_name_string(*server_name); VLOG(2) << "Connecting to server " << server_name_string << " via HTTP proxy " << proxy_name; @@ -342,7 +308,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, request.body = nullptr; grpc_slice request_slice = grpc_httpcli_format_connect_request( &request, server_name_string.c_str(), server_name_string.c_str()); - grpc_slice_buffer_add(&write_buffer_, request_slice); + write_buffer_.Append(Slice(request_slice)); // Clean up. gpr_free(headers); for (size_t i = 0; i < num_header_strings; ++i) { @@ -352,15 +318,14 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, // Take a new ref to be held by the write callback. Ref().release(); grpc_endpoint_write( - args->endpoint, &write_buffer_, - GRPC_CLOSURE_INIT(&request_done_closure_, + args->endpoint.get(), write_buffer_.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_write_done_scheduler_, &HttpConnectHandshaker::OnWriteDoneScheduler, this, grpc_schedule_on_exec_ctx), nullptr, /*max_frame_size=*/INT_MAX); } HttpConnectHandshaker::HttpConnectHandshaker() { - grpc_slice_buffer_init(&write_buffer_); grpc_http_parser_init(&http_parser_, GRPC_HTTP_RESPONSE, &http_response_); } diff --git a/deps/grpc/src/core/handshaker/http_connect/http_proxy_mapper.cc b/deps/grpc/src/core/handshaker/http_connect/http_proxy_mapper.cc index eb38d837e1..93c8e2fe8e 100644 --- a/deps/grpc/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/deps/grpc/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -41,7 +41,6 @@ #include #include -#include #include #include "src/core/handshaker/http_connect/http_connect_handshaker.h" @@ -128,13 +127,12 @@ absl::optional GetHttpProxyServer( if (uri_str->empty()) return absl::nullopt; uri = URI::Parse(*uri_str); if (!uri.ok() || uri->authority().empty()) { - gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var. Error: %s", - uri.status().ToString().c_str()); + LOG(ERROR) << "cannot parse value of 'http_proxy' env var. Error: " + << uri.status(); return absl::nullopt; } if (uri->scheme() != "http") { - gpr_log(GPR_ERROR, "'%s' scheme not supported in proxy URI", - uri->scheme().c_str()); + LOG(ERROR) << "'" << uri->scheme() << "' scheme not supported in proxy URI"; return absl::nullopt; } // Split on '@' to separate user credentials from host @@ -193,9 +191,9 @@ absl::optional GetAddressProxyServer( } auto address = StringToSockaddr(*address_value); if (!address.ok()) { - gpr_log(GPR_ERROR, "cannot parse value of '%s' env var. Error: %s", - HttpProxyMapper::kAddressProxyEnvVar, - address.status().ToString().c_str()); + LOG(ERROR) << "cannot parse value of '" + << std::string(HttpProxyMapper::kAddressProxyEnvVar) + << "' env var. Error: " << address.status().ToString(); return absl::nullopt; } return *address; @@ -213,10 +211,9 @@ absl::optional HttpProxyMapper::MapName( if (!name_to_resolve.has_value()) return name_to_resolve; absl::StatusOr uri = URI::Parse(server_uri); if (!uri.ok() || uri->path().empty()) { - gpr_log(GPR_ERROR, - "'http_proxy' environment variable set, but cannot " - "parse server URI '%s' -- not using proxy. Error: %s", - std::string(server_uri).c_str(), uri.status().ToString().c_str()); + LOG(ERROR) << "'http_proxy' environment variable set, but cannot " + "parse server URI '" + << server_uri << "' -- not using proxy. Error: " << uri.status(); return absl::nullopt; } if (uri->scheme() == "unix") { @@ -272,14 +269,14 @@ absl::optional HttpProxyMapper::MapAddress( } auto address_string = grpc_sockaddr_to_string(&address, true); if (!address_string.ok()) { - gpr_log(GPR_ERROR, "Unable to convert address to string: %s", - std::string(address_string.status().message()).c_str()); + LOG(ERROR) << "Unable to convert address to string: " + << address_string.status(); return absl::nullopt; } std::string host_name, port; if (!SplitHostPort(*address_string, &host_name, &port)) { - gpr_log(GPR_ERROR, "Address %s cannot be split in host and port", - address_string->c_str()); + LOG(ERROR) << "Address " << *address_string + << " cannot be split in host and port"; return absl::nullopt; } auto enabled_addresses = GetChannelArgOrEnvVarValue( diff --git a/deps/grpc/src/core/handshaker/security/secure_endpoint.cc b/deps/grpc/src/core/handshaker/security/secure_endpoint.cc index 18fde15243..cf720f19d2 100644 --- a/deps/grpc/src/core/handshaker/security/secure_endpoint.cc +++ b/deps/grpc/src/core/handshaker/security/secure_endpoint.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" @@ -37,15 +38,16 @@ #include #include #include -#include #include #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -64,17 +66,18 @@ static void on_read(void* user_data, grpc_error_handle error); static void on_write(void* user_data, grpc_error_handle error); namespace { -struct secure_endpoint { - secure_endpoint(const grpc_endpoint_vtable* vtable, +struct secure_endpoint : public grpc_endpoint { + secure_endpoint(const grpc_endpoint_vtable* vtbl, tsi_frame_protector* protector, tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* transport, grpc_slice* leftover_slices, + grpc_core::OrphanablePtr endpoint, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, size_t leftover_nslices) - : wrapped_ep(transport), + : wrapped_ep(std::move(endpoint)), protector(protector), zero_copy_protector(zero_copy_protector) { - base.vtable = vtable; + this->vtable = vtbl; gpr_mu_init(&protector_mu); GRPC_CLOSURE_INIT(&on_read, ::on_read, this, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&on_write, ::on_write, this, grpc_schedule_on_exec_ctx); @@ -105,7 +108,6 @@ struct secure_endpoint { } ~secure_endpoint() { - memory_owner.Reset(); tsi_frame_protector_destroy(protector); tsi_zero_copy_grpc_protector_destroy(zero_copy_protector); grpc_slice_buffer_destroy(&source_buffer); @@ -117,8 +119,7 @@ struct secure_endpoint { gpr_mu_destroy(&protector_mu); } - grpc_endpoint base; - grpc_endpoint* wrapped_ep; + grpc_core::OrphanablePtr wrapped_ep; struct tsi_frame_protector* protector; struct tsi_zero_copy_grpc_protector* zero_copy_protector; gpr_mu protector_mu; @@ -157,9 +158,8 @@ static void secure_endpoint_unref(secure_endpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(secure_endpoint)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECENDP unref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, reason, val, - val - 1); + VLOG(2).AtLocation(file, line) << "SECENDP unref " << ep << " : " << reason + << " " << val << " -> " << val - 1; } if (gpr_unref(&ep->ref)) { destroy(ep); @@ -170,9 +170,8 @@ static void secure_endpoint_ref(secure_endpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(secure_endpoint)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECENDP ref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, reason, val, - val + 1); + VLOG(2).AtLocation(file, line) << "SECENDP ref " << ep << " : " << reason + << " " << val << " -> " << val + 1; } gpr_ref(&ep->ref); } @@ -196,10 +195,8 @@ static void maybe_post_reclaimer(secure_endpoint* ep) { grpc_core::ReclamationPass::kBenign, [ep](absl::optional sweep) { if (sweep.has_value()) { - if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, - "secure endpoint: benign reclamation to free memory"); - } + GRPC_TRACE_LOG(resource_quota, INFO) + << "secure endpoint: benign reclamation to free memory"; grpc_slice temp_read_slice; grpc_slice temp_write_slice; @@ -255,6 +252,13 @@ static void on_read(void* user_data, grpc_error_handle error) { { grpc_core::MutexLock l(&ep->read_mu); + + // If we were shut down after this callback was scheduled with OK + // status but before it was invoked, we need to treat that as an error. + if (ep->wrapped_ep == nullptr && error.ok()) { + error = absl::CancelledError("secure endpoint shutdown"); + } + uint8_t* cur = GRPC_SLICE_START_PTR(ep->read_staging_buffer); uint8_t* end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); @@ -293,8 +297,7 @@ static void on_read(void* user_data, grpc_error_handle error) { &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)); + LOG(ERROR) << "Decryption error: " << tsi_result_to_string(result); break; } message_bytes += processed_message_size; @@ -365,8 +368,8 @@ static void endpoint_read(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, return; } - grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, urgent, - /*min_progress_size=*/ep->min_progress_size); + grpc_endpoint_read(ep->wrapped_ep.get(), &ep->source_buffer, &ep->on_read, + urgent, /*min_progress_size=*/ep->min_progress_size); } static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, @@ -382,13 +385,17 @@ static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, static void on_write(void* user_data, grpc_error_handle error) { secure_endpoint* ep = static_cast(user_data); - grpc_core::ExecCtx::Run(DEBUG_LOCATION, std::exchange(ep->write_cb, nullptr), - std::move(error)); + grpc_closure* cb = ep->write_cb; + ep->write_cb = nullptr; SECURE_ENDPOINT_UNREF(ep, "write"); + grpc_core::EnsureRunInExecCtx([cb, error = std::move(error)]() { + grpc_core::Closure::Run(DEBUG_LOCATION, cb, error); + }); } static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, grpc_closure* cb, void* arg, int max_frame_size) { + GRPC_LATENT_SEE_INNER_SCOPE("secure_endpoint write"); unsigned i; tsi_result result = TSI_OK; secure_endpoint* ep = reinterpret_cast(secure_ep); @@ -445,8 +452,7 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, &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)); + LOG(ERROR) << "Encryption error: " << tsi_result_to_string(result); break; } message_bytes += processed_message_size; @@ -500,52 +506,55 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, // output_buffer at any time until the write completes. SECURE_ENDPOINT_REF(ep, "write"); ep->write_cb = cb; - grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, &ep->on_write, arg, - max_frame_size); + grpc_endpoint_write(ep->wrapped_ep.get(), &ep->output_buffer, &ep->on_write, + arg, max_frame_size); } static void endpoint_destroy(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_destroy(ep->wrapped_ep); + ep->read_mu.Lock(); + ep->wrapped_ep.reset(); + ep->memory_owner.Reset(); + ep->read_mu.Unlock(); SECURE_ENDPOINT_UNREF(ep, "destroy"); } static void endpoint_add_to_pollset(grpc_endpoint* secure_ep, grpc_pollset* pollset) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(ep->wrapped_ep.get(), pollset); } static void endpoint_add_to_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep.get(), pollset_set); } static void endpoint_delete_from_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep.get(), pollset_set); } static absl::string_view endpoint_get_peer(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_peer(ep->wrapped_ep); + return grpc_endpoint_get_peer(ep->wrapped_ep.get()); } static absl::string_view endpoint_get_local_address(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_local_address(ep->wrapped_ep); + return grpc_endpoint_get_local_address(ep->wrapped_ep.get()); } static int endpoint_get_fd(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_fd(ep->wrapped_ep); + return grpc_endpoint_get_fd(ep->wrapped_ep.get()); } static bool endpoint_can_track_err(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_can_track_err(ep->wrapped_ep); + return grpc_endpoint_can_track_err(ep->wrapped_ep.get()); } static const grpc_endpoint_vtable vtable = {endpoint_read, @@ -559,13 +568,13 @@ static const grpc_endpoint_vtable vtable = {endpoint_read, endpoint_get_fd, endpoint_can_track_err}; -grpc_endpoint* grpc_secure_endpoint_create( +grpc_core::OrphanablePtr grpc_secure_endpoint_create( struct tsi_frame_protector* protector, struct tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* to_wrap, grpc_slice* leftover_slices, - const grpc_channel_args* channel_args, size_t leftover_nslices) { - secure_endpoint* ep = - new secure_endpoint(&vtable, protector, zero_copy_protector, to_wrap, - leftover_slices, channel_args, leftover_nslices); - return &ep->base; + grpc_core::OrphanablePtr to_wrap, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, + size_t leftover_nslices) { + return grpc_core::MakeOrphanable( + &vtable, protector, zero_copy_protector, std::move(to_wrap), + leftover_slices, channel_args, leftover_nslices); } diff --git a/deps/grpc/src/core/handshaker/security/secure_endpoint.h b/deps/grpc/src/core/handshaker/security/secure_endpoint.h index a9d6d2088c..43add1a816 100644 --- a/deps/grpc/src/core/handshaker/security/secure_endpoint.h +++ b/deps/grpc/src/core/handshaker/security/secure_endpoint.h @@ -26,15 +26,17 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/endpoint.h" // Takes ownership of protector, zero_copy_protector, and to_wrap, and refs // leftover_slices. If zero_copy_protector is not NULL, protector will never be // used. -grpc_endpoint* grpc_secure_endpoint_create( +grpc_core::OrphanablePtr grpc_secure_endpoint_create( struct tsi_frame_protector* protector, struct tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* to_wrap, grpc_slice* leftover_slices, - const grpc_channel_args* channel_args, size_t leftover_nslices); + grpc_core::OrphanablePtr to_wrap, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, + size_t leftover_nslices); #endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H diff --git a/deps/grpc/src/core/handshaker/security/security_handshaker.cc b/deps/grpc/src/core/handshaker/security/security_handshaker.cc index dba7f399e1..e54735e53a 100644 --- a/deps/grpc/src/core/handshaker/security/security_handshaker.cc +++ b/deps/grpc/src/core/handshaker/security/security_handshaker.cc @@ -28,6 +28,7 @@ #include #include "absl/base/attributes.h" +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" @@ -40,7 +41,6 @@ #include #include #include -#include #include #include "src/core/channelz/channelz.h" @@ -79,36 +79,35 @@ class SecurityHandshaker : public Handshaker { grpc_security_connector* connector, const ChannelArgs& args); ~SecurityHandshaker() override; - void Shutdown(grpc_error_handle why) override; - void DoHandshake(grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override; - const char* name() const override { return "security"; } + absl::string_view name() const override { return "security"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: grpc_error_handle DoHandshakerNextLocked(const unsigned char* bytes_received, - size_t bytes_received_size); + size_t bytes_received_size) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); grpc_error_handle OnHandshakeNextDoneLocked( tsi_result result, const unsigned char* bytes_to_send, - size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result); - void HandshakeFailedLocked(grpc_error_handle error); - void CleanupArgsForFailureLocked(); - - static void OnHandshakeDataReceivedFromPeerFn(void* arg, - grpc_error_handle error); - static void OnHandshakeDataSentToPeerFn(void* arg, grpc_error_handle error); - static void OnHandshakeDataReceivedFromPeerFnScheduler( - void* arg, grpc_error_handle error); - static void OnHandshakeDataSentToPeerFnScheduler(void* arg, - grpc_error_handle error); + size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void HandshakeFailedLocked(absl::Status error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void Finish(absl::Status status); + + void OnHandshakeDataReceivedFromPeerFn(absl::Status error); + void OnHandshakeDataSentToPeerFn(absl::Status error); + void OnHandshakeDataReceivedFromPeerFnScheduler(grpc_error_handle error); + void OnHandshakeDataSentToPeerFnScheduler(grpc_error_handle error); static void OnHandshakeNextDoneGrpcWrapper( tsi_result result, void* user_data, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result); - static void OnPeerCheckedFn(void* arg, grpc_error_handle error); - void OnPeerCheckedInner(grpc_error_handle error); + void OnPeerCheckedFn(grpc_error_handle error); size_t MoveReadBufferIntoHandshakeBuffer(); - grpc_error_handle CheckPeerLocked(); + grpc_error_handle CheckPeerLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // State set at creation time. tsi_handshaker* handshaker_; @@ -117,23 +116,19 @@ class SecurityHandshaker : public Handshaker { Mutex mu_; bool is_shutdown_ = false; - // Read buffer to destroy after a shutdown. - grpc_slice_buffer* read_buffer_to_destroy_ = nullptr; // State saved while performing the handshake. HandshakerArgs* args_ = nullptr; - grpc_closure* on_handshake_done_ = nullptr; + absl::AnyInvocable on_handshake_done_; size_t handshake_buffer_size_; unsigned char* handshake_buffer_; - grpc_slice_buffer outgoing_; - grpc_closure on_handshake_data_sent_to_peer_; - grpc_closure on_handshake_data_received_from_peer_; - grpc_closure on_peer_checked_; + SliceBuffer outgoing_; RefCountedPtr auth_context_; tsi_handshaker_result* handshaker_result_ = nullptr; size_t max_frame_size_ = 0; std::string tsi_handshake_error_; + grpc_closure* on_peer_checked_ ABSL_GUARDED_BY(mu_) = nullptr; }; SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, @@ -145,54 +140,35 @@ SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, handshake_buffer_( static_cast(gpr_malloc(handshake_buffer_size_))), max_frame_size_( - std::max(0, args.GetInt(GRPC_ARG_TSI_MAX_FRAME_SIZE).value_or(0))) { - grpc_slice_buffer_init(&outgoing_); - GRPC_CLOSURE_INIT(&on_peer_checked_, &SecurityHandshaker::OnPeerCheckedFn, - this, grpc_schedule_on_exec_ctx); -} + std::max(0, args.GetInt(GRPC_ARG_TSI_MAX_FRAME_SIZE).value_or(0))) {} SecurityHandshaker::~SecurityHandshaker() { tsi_handshaker_destroy(handshaker_); tsi_handshaker_result_destroy(handshaker_result_); - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } gpr_free(handshake_buffer_); - grpc_slice_buffer_destroy(&outgoing_); auth_context_.reset(DEBUG_LOCATION, "handshake"); connector_.reset(DEBUG_LOCATION, "handshake"); } size_t SecurityHandshaker::MoveReadBufferIntoHandshakeBuffer() { - size_t bytes_in_read_buffer = args_->read_buffer->length; + size_t bytes_in_read_buffer = args_->read_buffer.Length(); if (handshake_buffer_size_ < bytes_in_read_buffer) { handshake_buffer_ = static_cast( gpr_realloc(handshake_buffer_, bytes_in_read_buffer)); handshake_buffer_size_ = bytes_in_read_buffer; } size_t offset = 0; - while (args_->read_buffer->count > 0) { - grpc_slice* next_slice = grpc_slice_buffer_peek_first(args_->read_buffer); - memcpy(handshake_buffer_ + offset, GRPC_SLICE_START_PTR(*next_slice), - GRPC_SLICE_LENGTH(*next_slice)); - offset += GRPC_SLICE_LENGTH(*next_slice); - grpc_slice_buffer_remove_first(args_->read_buffer); + while (args_->read_buffer.Count() > 0) { + Slice slice = args_->read_buffer.TakeFirst(); + memcpy(handshake_buffer_ + offset, slice.data(), slice.size()); + offset += slice.size(); } return bytes_in_read_buffer; } -// Set args_ fields to NULL, saving the endpoint and read buffer for -// later destruction. -void SecurityHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void SecurityHandshaker::HandshakeFailedLocked(grpc_error_handle error) { +void SecurityHandshaker::HandshakeFailedLocked(absl::Status error) { if (error.ok()) { // If we were shut down after the handshake succeeded but before an // endpoint callback was invoked, we need to generate our own error. @@ -200,17 +176,17 @@ void SecurityHandshaker::HandshakeFailedLocked(grpc_error_handle error) { } if (!is_shutdown_) { tsi_handshaker_shutdown(handshaker_); - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - // Not shutting down, so the write failed. Clean up before - // invoking the callback. - CleanupArgsForFailureLocked(); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. is_shutdown_ = true; } // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); + Finish(std::move(error)); +} + +void SecurityHandshaker::Finish(absl::Status status) { + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), + std::move(status)); } namespace { @@ -238,8 +214,9 @@ MakeChannelzSecurityFromAuthContext(grpc_auth_context* auth_context) { } // namespace -void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { +void SecurityHandshaker::OnPeerCheckedFn(grpc_error_handle error) { MutexLock lock(&mu_); + on_peer_checked_ = nullptr; if (!error.ok() || is_shutdown_) { HandshakeFailedLocked(error); return; @@ -306,19 +283,18 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { grpc_slice slice = grpc_slice_from_copied_buffer( reinterpret_cast(unused_bytes), unused_bytes_size); args_->endpoint = grpc_secure_endpoint_create( - protector, zero_copy_protector, args_->endpoint, &slice, + protector, zero_copy_protector, std::move(args_->endpoint), &slice, args_->args.ToC().get(), 1); CSliceUnref(slice); } else { args_->endpoint = grpc_secure_endpoint_create( - protector, zero_copy_protector, args_->endpoint, nullptr, + protector, zero_copy_protector, std::move(args_->endpoint), nullptr, args_->args.ToC().get(), 0); } } else if (unused_bytes_size > 0) { // Not wrapping the endpoint, so just pass along unused bytes. - grpc_slice slice = grpc_slice_from_copied_buffer( - reinterpret_cast(unused_bytes), unused_bytes_size); - grpc_slice_buffer_add(args_->read_buffer, slice); + args_->read_buffer.Append(Slice::FromCopiedBuffer( + reinterpret_cast(unused_bytes), unused_bytes_size)); } // Done with handshaker result. tsi_handshaker_result_destroy(handshaker_result_); @@ -329,16 +305,11 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { args_->args = args_->args.SetObject( MakeChannelzSecurityFromAuthContext(auth_context_.get())); } - // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, absl::OkStatus()); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. is_shutdown_ = true; -} - -void SecurityHandshaker::OnPeerCheckedFn(void* arg, grpc_error_handle error) { - RefCountedPtr(static_cast(arg)) - ->OnPeerCheckedInner(error); + // Invoke callback. + Finish(absl::OkStatus()); } grpc_error_handle SecurityHandshaker::CheckPeerLocked() { @@ -349,8 +320,12 @@ grpc_error_handle SecurityHandshaker::CheckPeerLocked() { return GRPC_ERROR_CREATE(absl::StrCat("Peer extraction failed (", tsi_result_to_string(result), ")")); } - connector_->check_peer(peer, args_->endpoint, args_->args, &auth_context_, - &on_peer_checked_); + on_peer_checked_ = NewClosure( + [self = RefAsSubclass()](absl::Status status) { + self->OnPeerCheckedFn(std::move(status)); + }); + connector_->check_peer(peer, args_->endpoint.get(), args_->args, + &auth_context_, on_peer_checked_); grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( auth_context_.get(), GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME); const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); @@ -374,11 +349,11 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( if (result == TSI_INCOMPLETE_DATA) { CHECK_EQ(bytes_to_send_size, 0u); grpc_endpoint_read( - args_->endpoint, args_->read_buffer, - GRPC_CLOSURE_INIT( - &on_handshake_data_received_from_peer_, - &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, - this, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + NewClosure([self = RefAsSubclass()]( + absl::Status status) { + self->OnHandshakeDataReceivedFromPeerFnScheduler(std::move(status)); + }), /*urgent=*/true, /*min_progress_size=*/1); return error; } @@ -388,6 +363,8 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( if (security_connector != nullptr) { connector_type = security_connector->type().name(); } + // TODO(roth): Get a better signal from the TSI layer as to what + // status code we should use here. return GRPC_ERROR_CREATE(absl::StrCat( connector_type, " handshake failed (", tsi_result_to_string(result), ")", (tsi_handshake_error_.empty() ? "" : ": "), tsi_handshake_error_)); @@ -399,25 +376,24 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( } if (bytes_to_send_size > 0) { // Send data to peer, if needed. - grpc_slice to_send = grpc_slice_from_copied_buffer( - reinterpret_cast(bytes_to_send), bytes_to_send_size); - grpc_slice_buffer_reset_and_unref(&outgoing_); - grpc_slice_buffer_add(&outgoing_, to_send); + outgoing_.Clear(); + outgoing_.Append(Slice::FromCopiedBuffer( + reinterpret_cast(bytes_to_send), bytes_to_send_size)); grpc_endpoint_write( - args_->endpoint, &outgoing_, - GRPC_CLOSURE_INIT( - &on_handshake_data_sent_to_peer_, - &SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler, this, - grpc_schedule_on_exec_ctx), + args_->endpoint.get(), outgoing_.c_slice_buffer(), + NewClosure( + [self = RefAsSubclass()](absl::Status status) { + self->OnHandshakeDataSentToPeerFnScheduler(std::move(status)); + }), nullptr, /*max_frame_size=*/INT_MAX); } else if (handshaker_result == nullptr) { // There is nothing to send, but need to read from peer. grpc_endpoint_read( - args_->endpoint, args_->read_buffer, - GRPC_CLOSURE_INIT( - &on_handshake_data_received_from_peer_, - &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, - this, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + NewClosure([self = RefAsSubclass()]( + absl::Status status) { + self->OnHandshakeDataReceivedFromPeerFnScheduler(std::move(status)); + }), /*urgent=*/true, /*min_progress_size=*/1); } else { // Handshake has finished, check peer and so on. @@ -435,9 +411,7 @@ void SecurityHandshaker::OnHandshakeNextDoneGrpcWrapper( grpc_error_handle error = h->OnHandshakeNextDoneLocked( result, bytes_to_send, bytes_to_send_size, handshaker_result); if (!error.ok()) { - h->HandshakeFailedLocked(error); - } else { - h.release(); // Avoid unref + h->HandshakeFailedLocked(std::move(error)); } } @@ -447,13 +421,15 @@ grpc_error_handle SecurityHandshaker::DoHandshakerNextLocked( const unsigned char* bytes_to_send = nullptr; size_t bytes_to_send_size = 0; tsi_handshaker_result* hs_result = nullptr; + auto self = RefAsSubclass(); tsi_result result = tsi_handshaker_next( handshaker_, bytes_received, bytes_received_size, &bytes_to_send, - &bytes_to_send_size, &hs_result, &OnHandshakeNextDoneGrpcWrapper, this, - &tsi_handshake_error_); + &bytes_to_send_size, &hs_result, &OnHandshakeNextDoneGrpcWrapper, + self.get(), &tsi_handshake_error_); if (result == TSI_ASYNC) { - // Handshaker operating asynchronously. Nothing else to do here; - // callback will be invoked in a TSI thread. + // Handshaker operating asynchronously. Callback will be invoked in a TSI + // thread. We no longer own the ref held in self. + self.release(); return absl::OkStatus(); } // Handshaker returned synchronously. Invoke callback directly in @@ -463,109 +439,103 @@ grpc_error_handle SecurityHandshaker::DoHandshakerNextLocked( } // This callback might be run inline while we are still holding on to the mutex, -// so schedule OnHandshakeDataReceivedFromPeerFn on ExecCtx to avoid a deadlock. +// so run OnHandshakeDataReceivedFromPeerFn asynchronously to avoid a deadlock. +// TODO(roth): This will no longer be necessary once we migrate to the +// EventEngine endpoint API. void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler( - void* arg, grpc_error_handle error) { - SecurityHandshaker* h = static_cast(arg); - ExecCtx::Run( - DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&h->on_handshake_data_received_from_peer_, - &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn, - h, grpc_schedule_on_exec_ctx), - error); + grpc_error_handle error) { + args_->event_engine->Run([self = RefAsSubclass(), + error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnHandshakeDataReceivedFromPeerFn(std::move(error)); + // Avoid destruction outside of an ExecCtx (since this is non-cancelable). + self.reset(); + }); } -void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn( - void* arg, grpc_error_handle error) { - RefCountedPtr h(static_cast(arg)); - MutexLock lock(&h->mu_); - if (!error.ok() || h->is_shutdown_) { - h->HandshakeFailedLocked( +void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn(absl::Status error) { + MutexLock lock(&mu_); + if (!error.ok() || is_shutdown_) { + HandshakeFailedLocked( GRPC_ERROR_CREATE_REFERENCING("Handshake read failed", &error, 1)); return; } // Copy all slices received. - size_t bytes_received_size = h->MoveReadBufferIntoHandshakeBuffer(); + size_t bytes_received_size = MoveReadBufferIntoHandshakeBuffer(); // Call TSI handshaker. - error = h->DoHandshakerNextLocked(h->handshake_buffer_, bytes_received_size); + error = DoHandshakerNextLocked(handshake_buffer_, bytes_received_size); if (!error.ok()) { - h->HandshakeFailedLocked(error); - } else { - h.release(); // Avoid unref + HandshakeFailedLocked(std::move(error)); } } // This callback might be run inline while we are still holding on to the mutex, -// so schedule OnHandshakeDataSentToPeerFn on ExecCtx to avoid a deadlock. +// so run OnHandshakeDataSentToPeerFn asynchronously to avoid a deadlock. +// TODO(roth): This will no longer be necessary once we migrate to the +// EventEngine endpoint API. void SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler( - void* arg, grpc_error_handle error) { - SecurityHandshaker* h = static_cast(arg); - ExecCtx::Run( - DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&h->on_handshake_data_sent_to_peer_, - &SecurityHandshaker::OnHandshakeDataSentToPeerFn, h, - grpc_schedule_on_exec_ctx), - error); + grpc_error_handle error) { + args_->event_engine->Run([self = RefAsSubclass(), + error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnHandshakeDataSentToPeerFn(std::move(error)); + // Avoid destruction outside of an ExecCtx (since this is non-cancelable). + self.reset(); + }); } -void SecurityHandshaker::OnHandshakeDataSentToPeerFn(void* arg, - grpc_error_handle error) { - RefCountedPtr h(static_cast(arg)); - MutexLock lock(&h->mu_); - if (!error.ok() || h->is_shutdown_) { - h->HandshakeFailedLocked( +void SecurityHandshaker::OnHandshakeDataSentToPeerFn(absl::Status error) { + MutexLock lock(&mu_); + if (!error.ok() || is_shutdown_) { + HandshakeFailedLocked( GRPC_ERROR_CREATE_REFERENCING("Handshake write failed", &error, 1)); return; } // We may be done. - if (h->handshaker_result_ == nullptr) { + if (handshaker_result_ == nullptr) { grpc_endpoint_read( - h->args_->endpoint, h->args_->read_buffer, - GRPC_CLOSURE_INIT( - &h->on_handshake_data_received_from_peer_, - &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, - h.get(), grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + NewClosure([self = RefAsSubclass()]( + absl::Status status) { + self->OnHandshakeDataReceivedFromPeerFnScheduler(std::move(status)); + }), /*urgent=*/true, /*min_progress_size=*/1); } else { - error = h->CheckPeerLocked(); + error = CheckPeerLocked(); if (!error.ok()) { - h->HandshakeFailedLocked(error); + HandshakeFailedLocked(error); return; } } - h.release(); // Avoid unref } // // public handshaker API // -void SecurityHandshaker::Shutdown(grpc_error_handle why) { +void SecurityHandshaker::Shutdown(grpc_error_handle error) { MutexLock lock(&mu_); if (!is_shutdown_) { is_shutdown_ = true; - connector_->cancel_check_peer(&on_peer_checked_, why); + connector_->cancel_check_peer(on_peer_checked_, std::move(error)); tsi_handshaker_shutdown(handshaker_); - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); + args_->endpoint.reset(); } } -void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { - auto ref = Ref(); +void SecurityHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { MutexLock lock(&mu_); args_ = args; - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); size_t bytes_received_size = MoveReadBufferIntoHandshakeBuffer(); grpc_error_handle error = DoHandshakerNextLocked(handshake_buffer_, bytes_received_size); if (!error.ok()) { HandshakeFailedLocked(error); - } else { - ref.release(); // Avoid unref } } @@ -576,19 +546,13 @@ void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, class FailHandshaker : public Handshaker { public: explicit FailHandshaker(absl::Status status) : status_(std::move(status)) {} - const char* name() const override { return "security_fail"; } - void Shutdown(grpc_error_handle /*why*/) override {} - void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override { - grpc_endpoint_destroy(args->endpoint); - args->endpoint = nullptr; - args->args = ChannelArgs(); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - args->read_buffer = nullptr; - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, status_); + absl::string_view name() const override { return "security_fail"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override { + InvokeOnHandshakeDone(args, std::move(on_handshake_done), status_); } + void Shutdown(absl::Status /*error*/) override {} private: ~FailHandshaker() override = default; diff --git a/deps/grpc/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/deps/grpc/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index fd557e47dc..77ae19ef7d 100644 --- a/deps/grpc/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/deps/grpc/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -19,8 +19,10 @@ #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include +#include #include "absl/base/thread_annotations.h" +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -29,7 +31,6 @@ #include #include #include -#include #include #include "src/core/handshaker/handshaker.h" @@ -61,24 +62,23 @@ namespace { class TCPConnectHandshaker : public Handshaker { public: explicit TCPConnectHandshaker(grpc_pollset_set* pollset_set); - void Shutdown(grpc_error_handle why) override; - void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override; - const char* name() const override { return "tcp_connect"; } + absl::string_view name() const override { return "tcp_connect"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: ~TCPConnectHandshaker() override; - void CleanupArgsForFailureLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - void FinishLocked(grpc_error_handle error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void FinishLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); static void Connected(void* arg, grpc_error_handle error); Mutex mu_; bool shutdown_ ABSL_GUARDED_BY(mu_) = false; - // Endpoint and read buffer to destroy after a shutdown. + // Endpoint to destroy after a shutdown. grpc_endpoint* endpoint_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; - grpc_slice_buffer* read_buffer_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; - grpc_closure* on_handshake_done_ ABSL_GUARDED_BY(mu_) = nullptr; + absl::AnyInvocable on_handshake_done_ + ABSL_GUARDED_BY(mu_); grpc_pollset_set* interested_parties_ = nullptr; grpc_polling_entity pollent_; HandshakerArgs* args_ = nullptr; @@ -99,33 +99,32 @@ TCPConnectHandshaker::TCPConnectHandshaker(grpc_pollset_set* pollset_set) GRPC_CLOSURE_INIT(&connected_, Connected, this, grpc_schedule_on_exec_ctx); } -void TCPConnectHandshaker::Shutdown(grpc_error_handle /*why*/) { +void TCPConnectHandshaker::Shutdown(absl::Status /*error*/) { // TODO(anramach): After migration to EventEngine, cancel the in-progress // TCP connection attempt. - { - MutexLock lock(&mu_); - if (!shutdown_) { - shutdown_ = true; - // If we are shutting down while connecting, respond back with - // handshake done. - // The callback from grpc_tcp_client_connect will perform - // the necessary clean up. - if (on_handshake_done_ != nullptr) { - CleanupArgsForFailureLocked(); - FinishLocked(GRPC_ERROR_CREATE("tcp handshaker shutdown")); - } + MutexLock lock(&mu_); + if (!shutdown_) { + shutdown_ = true; + // If we are shutting down while connecting, respond back with + // handshake done. + // The callback from grpc_tcp_client_connect will perform + // the necessary clean up. + if (on_handshake_done_ != nullptr) { + // TODO(roth): When we remove the legacy grpc_error APIs, propagate the + // status passed to shutdown as part of the message here. + FinishLocked(GRPC_ERROR_CREATE("tcp handshaker shutdown")); } } } -void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { +void TCPConnectHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { { MutexLock lock(&mu_); - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); } - CHECK_EQ(args->endpoint, nullptr); + CHECK_EQ(args->endpoint.get(), nullptr); args_ = args; absl::StatusOr uri = URI::Parse( args->args.GetString(GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS).value()); @@ -149,7 +148,7 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, Ref().release(); // Ref held by callback. // As we fake the TCP client connection failure when shutdown is called // we don't want to pass args->endpoint directly. - // Instead pass endpoint_ and swap this endpoint to + // Instead pass endpoint_to_destroy_ and swap this endpoint to // args endpoint on success. grpc_tcp_client_connect( &connected_, &endpoint_to_destroy_, interested_parties_, @@ -171,21 +170,19 @@ void TCPConnectHandshaker::Connected(void* arg, grpc_error_handle error) { self->endpoint_to_destroy_ = nullptr; } if (!self->shutdown_) { - self->CleanupArgsForFailureLocked(); self->shutdown_ = true; - self->FinishLocked(error); + self->FinishLocked(std::move(error)); } else { - // The on_handshake_done_ is already as part of shutdown when - // connecting So nothing to be done here other than unrefing the - // error. + // The on_handshake_done_ callback was already invoked as part of + // shutdown when connecting, so nothing to be done here. } return; } CHECK_NE(self->endpoint_to_destroy_, nullptr); - self->args_->endpoint = self->endpoint_to_destroy_; + self->args_->endpoint.reset(self->endpoint_to_destroy_); self->endpoint_to_destroy_ = nullptr; if (self->bind_endpoint_to_pollset_) { - grpc_endpoint_add_to_pollset_set(self->args_->endpoint, + grpc_endpoint_add_to_pollset_set(self->args_->endpoint.get(), self->interested_parties_); } self->FinishLocked(absl::OkStatus()); @@ -196,25 +193,14 @@ TCPConnectHandshaker::~TCPConnectHandshaker() { if (endpoint_to_destroy_ != nullptr) { grpc_endpoint_destroy(endpoint_to_destroy_); } - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } grpc_pollset_set_destroy(interested_parties_); } -void TCPConnectHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - -void TCPConnectHandshaker::FinishLocked(grpc_error_handle error) { +void TCPConnectHandshaker::FinishLocked(absl::Status error) { if (interested_parties_ != nullptr) { grpc_polling_entity_del_from_pollset_set(&pollent_, interested_parties_); } - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); - on_handshake_done_ = nullptr; + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), std::move(error)); } // diff --git a/deps/grpc/src/core/lib/backoff/backoff.cc b/deps/grpc/src/core/lib/backoff/backoff.cc index b0d6a9fa1f..b4a520d13d 100644 --- a/deps/grpc/src/core/lib/backoff/backoff.cc +++ b/deps/grpc/src/core/lib/backoff/backoff.cc @@ -20,23 +20,20 @@ #include -#include - namespace grpc_core { BackOff::BackOff(const Options& options) : options_(options) { Reset(); } -Timestamp BackOff::NextAttemptTime() { +Duration BackOff::NextAttemptDelay() { if (initial_) { initial_ = false; - return current_backoff_ + Timestamp::Now(); + } else { + current_backoff_ = std::min(current_backoff_ * options_.multiplier(), + options_.max_backoff()); } - current_backoff_ = std::min(current_backoff_ * options_.multiplier(), - options_.max_backoff()); - const Duration jitter = Duration::FromSecondsAsDouble( - absl::Uniform(rand_gen_, -options_.jitter() * current_backoff_.seconds(), - options_.jitter() * current_backoff_.seconds())); - return Timestamp::Now() + current_backoff_ + jitter; + const double jitter = + absl::Uniform(rand_gen_, 1 - options_.jitter(), 1 + options_.jitter()); + return current_backoff_ * jitter; } void BackOff::Reset() { diff --git a/deps/grpc/src/core/lib/backoff/backoff.h b/deps/grpc/src/core/lib/backoff/backoff.h index 003335b6b7..75e87d3d44 100644 --- a/deps/grpc/src/core/lib/backoff/backoff.h +++ b/deps/grpc/src/core/lib/backoff/backoff.h @@ -21,8 +21,6 @@ #include "absl/random/random.h" -#include - #include "src/core/lib/gprpp/time.h" namespace grpc_core { @@ -36,11 +34,11 @@ class BackOff { /// Initialize backoff machinery - does not need to be destroyed explicit BackOff(const Options& options); - /// Returns the time at which the next attempt should start. - Timestamp NextAttemptTime(); + /// Returns the delay before the next attempt should start. + Duration NextAttemptDelay(); - /// Reset the backoff, so the next value returned by NextAttemptTime() - /// will be the time of the second attempt (rather than the Nth). + /// Reset the backoff, so the next value returned by NextAttemptDelay() + /// will be the delay for the second attempt (rather than the Nth). void Reset(); class Options { diff --git a/deps/grpc/src/core/lib/channel/channel_args.h b/deps/grpc/src/core/lib/channel/channel_args.h index 55cb2785ab..301c0c287c 100644 --- a/deps/grpc/src/core/lib/channel/channel_args.h +++ b/deps/grpc/src/core/lib/channel/channel_args.h @@ -558,6 +558,11 @@ class ChannelArgs { bool WantMinimalStack() const; std::string ToString() const; + template + friend void AbslStringify(Sink& sink, const ChannelArgs& args) { + sink.Append(args.ToString()); + } + private: explicit ChannelArgs(AVL args); diff --git a/deps/grpc/src/core/lib/channel/channel_stack.cc b/deps/grpc/src/core/lib/channel/channel_stack.cc index 63e322d6b9..2590ab4590 100644 --- a/deps/grpc/src/core/lib/channel/channel_stack.cc +++ b/deps/grpc/src/core/lib/channel/channel_stack.cc @@ -26,7 +26,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include #include #include "src/core/lib/channel/channel_args.h" @@ -262,7 +261,9 @@ void grpc_call_stack_destroy(grpc_call_stack* stack, void grpc_call_next_op(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_call_element* next_elem = elem + 1; - GRPC_CALL_LOG_OP(GPR_INFO, next_elem, op); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << elem->filter->name << ":" << elem + << "]: " << grpc_transport_stream_op_batch_string(op, false); next_elem->filter->start_transport_stream_op_batch(next_elem, op); } @@ -292,10 +293,3 @@ grpc_call_stack* grpc_call_stack_from_top_element(grpc_call_element* elem) { void grpc_channel_stack_no_post_init(grpc_channel_stack*, grpc_channel_element*) {} - -void grpc_call_log_op(const char* file, int line, gpr_log_severity severity, - grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { - gpr_log(file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, - grpc_transport_stream_op_batch_string(op, false).c_str()); -} diff --git a/deps/grpc/src/core/lib/channel/channel_stack.h b/deps/grpc/src/core/lib/channel/channel_stack.h index ff0fc291c0..451cba6be9 100644 --- a/deps/grpc/src/core/lib/channel/channel_stack.h +++ b/deps/grpc/src/core/lib/channel/channel_stack.h @@ -53,7 +53,6 @@ #include #include #include -#include #include #include @@ -63,6 +62,7 @@ #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -159,7 +159,7 @@ struct grpc_channel_filter { const grpc_channel_info* channel_info); // The name of this filter - const char* name; + grpc_core::UniqueTypeName name; }; // A channel_element tracks its filter and the filter requested memory within // a channel allocation @@ -357,18 +357,7 @@ grpc_channel_stack* grpc_channel_stack_from_top_element( // 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); -void grpc_call_log_op(const char* file, int line, gpr_log_severity severity, - grpc_call_element* elem, - grpc_transport_stream_op_batch* op); - void grpc_channel_stack_no_post_init(grpc_channel_stack* stk, grpc_channel_element* elem); -#define GRPC_CALL_LOG_OP(sev, elem, op) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(channel)) { \ - grpc_call_log_op(sev, elem, op); \ - } \ - } while (0) - #endif // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H diff --git a/deps/grpc/src/core/lib/channel/channel_stack_builder_impl.cc b/deps/grpc/src/core/lib/channel/channel_stack_builder_impl.cc index 7db444474e..a5d93d81ed 100644 --- a/deps/grpc/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/deps/grpc/src/core/lib/channel/channel_stack_builder_impl.cc @@ -33,7 +33,6 @@ #include "absl/strings/str_cat.h" #include -#include #include #include "src/core/lib/channel/channel_fwd.h" diff --git a/deps/grpc/src/core/lib/channel/connected_channel.cc b/deps/grpc/src/core/lib/channel/connected_channel.cc index 5507e1ef65..9977ecdabf 100644 --- a/deps/grpc/src/core/lib/channel/connected_channel.cc +++ b/deps/grpc/src/core/lib/channel/connected_channel.cc @@ -34,7 +34,6 @@ #include #include #include -#include #include #include "src/core/lib/channel/call_finalization.h" @@ -267,7 +266,7 @@ const grpc_channel_filter kConnectedFilter{ }, connected_channel_destroy_channel_elem, connected_channel_get_channel_info, - "connected", + GRPC_UNIQUE_TYPE_NAME_HERE("connected"), }; // noop filter for the v3 stack: placeholder for now because other code requires @@ -288,7 +287,7 @@ const grpc_channel_filter kPromiseBasedTransportFilter = { +[](grpc_channel_stack*, grpc_channel_element*) {}, connected_channel_destroy_channel_elem, connected_channel_get_channel_info, - "connected", + GRPC_UNIQUE_TYPE_NAME_HERE("connected"), }; bool TransportSupportsClientPromiseBasedCalls(const ChannelArgs& args) { diff --git a/deps/grpc/src/core/lib/channel/promise_based_filter.cc b/deps/grpc/src/core/lib/channel/promise_based_filter.cc index e2d9d8cfff..5f0879dda2 100644 --- a/deps/grpc/src/core/lib/channel/promise_based_filter.cc +++ b/deps/grpc/src/core/lib/channel/promise_based_filter.cc @@ -23,6 +23,7 @@ #include "absl/base/attributes.h" #include "absl/functional/function_ref.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -99,11 +100,7 @@ BaseCallData::BaseCallData( receive_message_( flags & kFilterExaminesInboundMessages ? arena_->New(this, make_recv_interceptor()) - : nullptr), - event_engine_( - ChannelFilterFromElem(elem) - ->hack_until_per_channel_stack_event_engines_land_get_event_engine()) { -} + : nullptr) {} BaseCallData::~BaseCallData() { FakeActivity(this).Run([this] { @@ -210,10 +207,8 @@ void BaseCallData::CapturedBatch::ResumeWith(Flusher* releaser) { uintptr_t& refcnt = *RefCountField(batch); if (refcnt == 0) { // refcnt==0 ==> cancelled - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%sRESUME BATCH REQUEST CANCELLED", - releaser->call()->DebugTag().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << releaser->call()->DebugTag() << "RESUME BATCH REQUEST CANCELLED"; return; } if (--refcnt == 0) { @@ -247,7 +242,10 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error, /////////////////////////////////////////////////////////////////////////////// // BaseCallData::Flusher -BaseCallData::Flusher::Flusher(BaseCallData* call) : call_(call) { +BaseCallData::Flusher::Flusher(BaseCallData* call) + : latent_see::InnerScope( + GRPC_LATENT_SEE_METADATA("PromiseBasedFilter Flusher")), + call_(call) { GRPC_CALL_STACK_REF(call_->call_stack(), "flusher"); } @@ -266,10 +264,9 @@ BaseCallData::Flusher::~Flusher() { auto* batch = static_cast(p); BaseCallData* call = static_cast(batch->handler_private.extra_arg); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "FLUSHER:forward batch via closure: %s", - grpc_transport_stream_op_batch_string(batch, false).c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << "FLUSHER:forward batch via closure: " + << grpc_transport_stream_op_batch_string(batch, false); grpc_call_next_op(call->elem(), batch); GRPC_CALL_STACK_UNREF(call->call_stack(), "flusher_batch"); }; @@ -278,11 +275,9 @@ BaseCallData::Flusher::~Flusher() { if (call_->call() != nullptr && call_->call()->traced()) { batch->is_traced = true; } - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_INFO, "FLUSHER:queue batch to forward in closure: %s", - grpc_transport_stream_op_batch_string(release_[i], false).c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << "FLUSHER:queue batch to forward in closure: " + << grpc_transport_stream_op_batch_string(release_[i], false); batch->handler_private.extra_arg = call_; GRPC_CLOSURE_INIT(&batch->handler_private.closure, call_next_op, batch, nullptr); @@ -291,10 +286,9 @@ BaseCallData::Flusher::~Flusher() { "flusher_batch"); } call_closures_.RunClosuresWithoutYielding(call_->call_combiner()); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "FLUSHER:forward batch: %s", - grpc_transport_stream_op_batch_string(release_[0], false).c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << "FLUSHER:forward batch: " + << grpc_transport_stream_op_batch_string(release_[0], false); if (call_->call() != nullptr && call_->call()->traced()) { release_[0]->is_traced = true; } @@ -332,10 +326,8 @@ const char* BaseCallData::SendMessage::StateString(State state) { } void BaseCallData::SendMessage::StartOp(CapturedBatch batch) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.StartOp st=%s", base_->LogTag().c_str(), - StateString(state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() << " SendMessage.StartOp st=" << StateString(state_); switch (state_) { case State::kInitial: state_ = State::kGotBatchNoPipe; @@ -360,10 +352,8 @@ void BaseCallData::SendMessage::StartOp(CapturedBatch batch) { template void BaseCallData::SendMessage::GotPipe(T* pipe_end) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.GotPipe st=%s", base_->LogTag().c_str(), - StateString(state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() << " SendMessage.GotPipe st=" << StateString(state_); CHECK_NE(pipe_end, nullptr); switch (state_) { case State::kInitial: @@ -408,11 +398,9 @@ bool BaseCallData::SendMessage::IsIdle() const { void BaseCallData::SendMessage::OnComplete(absl::Status status) { Flusher flusher(base_); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.OnComplete st=%s status=%s", - base_->LogTag().c_str(), StateString(state_), - status.ToString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_) + << " status=" << status; switch (state_) { case State::kInitial: case State::kIdle: @@ -439,11 +427,9 @@ void BaseCallData::SendMessage::OnComplete(absl::Status status) { void BaseCallData::SendMessage::Done(const ServerMetadata& metadata, Flusher* flusher) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.Done st=%s md=%s", - base_->LogTag().c_str(), StateString(state_), - metadata.DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() << " SendMessage.Done st=" << StateString(state_) + << " md=" << metadata.DebugString(); switch (state_) { case State::kCancelled: case State::kCancelledButNotYetPolled: @@ -482,13 +468,12 @@ void BaseCallData::SendMessage::Done(const ServerMetadata& metadata, void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, bool allow_push_to_pipe) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.WakeInsideCombiner st=%s%s", - base_->LogTag().c_str(), StateString(state_), - state_ == State::kBatchCompleted - ? absl::StrCat(" status=", completed_status_.ToString()).c_str() - : ""); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " SendMessage.WakeInsideCombiner st=" << StateString(state_) + << (state_ == State::kBatchCompleted + ? absl::StrCat(" status=", completed_status_.ToString()) + : ""); switch (state_) { case State::kInitial: case State::kIdle: @@ -516,11 +501,11 @@ void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, CHECK(push_.has_value()); auto r_push = (*push_)(); if (auto* p = r_push.value_if_ready()) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s SendMessage.WakeInsideCombiner push complete, result=%s", - base_->LogTag().c_str(), *p ? "true" : "false"); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " SendMessage.WakeInsideCombiner push complete, " + "result=" + << (*p ? "true" : "false"); // We haven't pulled through yet, so this certainly shouldn't succeed. CHECK(!*p); state_ = State::kCancelled; @@ -530,12 +515,11 @@ void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, CHECK(next_.has_value()); auto r_next = (*next_)(); if (auto* p = r_next.value_if_ready()) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s SendMessage.WakeInsideCombiner next complete, " - "result.has_value=%s", - base_->LogTag().c_str(), p->has_value() ? "true" : "false"); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " SendMessage.WakeInsideCombiner next complete, " + "result.has_value=" + << (p->has_value() ? "true" : "false"); if (p->has_value()) { batch_->payload->send_message.send_message->Swap((**p)->payload()); batch_->payload->send_message.flags = (**p)->flags(); @@ -615,10 +599,9 @@ const char* BaseCallData::ReceiveMessage::StateString(State state) { } void BaseCallData::ReceiveMessage::StartOp(CapturedBatch& batch) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.StartOp st=%s", - base_->LogTag().c_str(), StateString(state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.StartOp st=" << StateString(state_); switch (state_) { case State::kInitial: state_ = State::kForwardedBatchNoPipe; @@ -656,10 +639,9 @@ void BaseCallData::ReceiveMessage::StartOp(CapturedBatch& batch) { template void BaseCallData::ReceiveMessage::GotPipe(T* pipe_end) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.GotPipe st=%s", - base_->LogTag().c_str(), StateString(state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.GotPipe st=" << StateString(state_); switch (state_) { case State::kInitial: state_ = State::kIdle; @@ -692,11 +674,10 @@ void BaseCallData::ReceiveMessage::GotPipe(T* pipe_end) { } void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.OnComplete st=%s status=%s", - base_->LogTag().c_str(), StateString(state_), - status.ToString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.OnComplete st=" << StateString(state_) + << " status=" << status; switch (state_) { case State::kInitial: case State::kIdle: @@ -733,11 +714,9 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { void BaseCallData::ReceiveMessage::Done(const ServerMetadata& metadata, Flusher* flusher) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.Done st=%s md=%s", - base_->LogTag().c_str(), StateString(state_), - metadata.DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() << " ReceiveMessage.Done st=" << StateString(state_) + << " md=" << metadata.DebugString(); switch (state_) { case State::kInitial: state_ = State::kCancelled; @@ -792,14 +771,12 @@ void BaseCallData::ReceiveMessage::Done(const ServerMetadata& metadata, void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, bool allow_push_to_pipe) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner st=%s push?=%s next?=%s " - "allow_push_to_pipe=%s", - base_->LogTag().c_str(), StateString(state_), - push_.has_value() ? "yes" : "no", next_.has_value() ? "yes" : "no", - allow_push_to_pipe ? "yes" : "no"); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner st=" << StateString(state_) + << " push?=" << (push_.has_value() ? "yes" : "no") + << " next?=" << (next_.has_value() ? "yes" : "no") + << " allow_push_to_pipe=" << (allow_push_to_pipe ? "yes" : "no"); switch (state_) { case State::kInitial: case State::kIdle: @@ -854,11 +831,10 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, CHECK(push_.has_value()); auto r_push = (*push_)(); if (auto* p = r_push.value_if_ready()) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner push complete: %s", - base_->LogTag().c_str(), *p ? "true" : "false"); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner push complete: " + << (*p ? "true" : "false"); // We haven't pulled through yet, so this certainly shouldn't succeed. CHECK(!*p); state_ = State::kCancelled; @@ -885,14 +861,11 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, p->cancelled() ? absl::CancelledError() : absl::OkStatus(), "recv_message"); } - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner next complete: %s " - "new_state=%s", - base_->LogTag().c_str(), - p->has_value() ? "got message" : "end of stream", - StateString(state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner next complete: " + << (p->has_value() ? "got message" : "end of stream") + << " new_state=" << StateString(state_); } if (state_ != State::kPulledFromPipe && state_ != State::kCompletedWhilePulledFromPipe) { @@ -904,11 +877,9 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, case State::kPulledFromPipe: { CHECK(push_.has_value()); if ((*push_)().ready()) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner push complete", - base_->LogTag().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner push complete"; if (state_ == State::kCompletedWhilePulledFromPipe) { interceptor()->Push()->Close(); state_ = State::kCancelled; @@ -1020,10 +991,9 @@ class ClientCallData::PollContext { void Run() { DCHECK(HasContext()); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollContext.Run %s", - self_->LogTag().c_str(), self_->DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << self_->LogTag() << " ClientCallData.PollContext.Run " + << self_->DebugString(); CHECK(have_scoped_activity_); repoll_ = false; if (self_->send_message() != nullptr) { @@ -1104,16 +1074,14 @@ class ClientCallData::PollContext { case SendInitialState::kForwarded: { // Poll the promise once since we're waiting for it. Poll poll = self_->promise_(); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollContext.Run: poll=%s; %s", - self_->LogTag().c_str(), - PollToString(poll, - [](const ServerMetadataHandle& h) { - return h->DebugString(); - }) - .c_str(), - self_->DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << self_->LogTag() << " ClientCallData.PollContext.Run: poll=" + << PollToString(poll, + [](const ServerMetadataHandle& h) { + return h->DebugString(); + }) + << "; " << self_->DebugString(); + if (auto* r = poll.value_if_ready()) { auto md = std::move(*r); if (self_->send_message() != nullptr) { @@ -1316,7 +1284,7 @@ ClientCallData::~ClientCallData() { } std::string ClientCallData::DebugTag() const { - return absl::StrFormat("PBF_CLIENT[%p]: [%s] ", this, elem()->filter->name); + return absl::StrFormat("PBF_CLIENT[%p]: [%v] ", this, elem()->filter->name); } // Activity implementation. @@ -1384,10 +1352,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { CapturedBatch batch(b); Flusher flusher(this); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s StartBatch %s", LogTag().c_str(), - DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString(); // If this is a cancel stream, cancel anything we have pending and propagate // the cancellation. @@ -1508,10 +1473,8 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Handle cancellation. void ClientCallData::Cancel(grpc_error_handle error, Flusher* flusher) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s Cancel error=%s", LogTag().c_str(), - error.ToString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " Cancel error=" << error.ToString(); // Track the latest reason for cancellation. cancelled_error_ = error; // Stop running the promise. @@ -1588,12 +1551,10 @@ void ClientCallData::StartPromise(Flusher* flusher) { } void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ClientCallData.RecvInitialMetadataReady %s error:%s md:%s", - LogTag().c_str(), DebugString().c_str(), error.ToString().c_str(), - recv_initial_metadata_->metadata->DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " ClientCallData.RecvInitialMetadataReady " + << DebugString() << " error:" << error.ToString() + << " md:" << recv_initial_metadata_->metadata->DebugString(); ScopedContext context(this); Flusher flusher(this); if (!error.ok()) { @@ -1672,10 +1633,8 @@ void ClientCallData::HookRecvTrailingMetadata(CapturedBatch batch) { // - return a wrapper around PollTrailingMetadata as the promise. ArenaPromise ClientCallData::MakeNextPromise( CallArgs call_args) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.MakeNextPromise %s", LogTag().c_str(), - DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " ClientCallData.MakeNextPromise " << DebugString(); CHECK_NE(poll_ctx_, nullptr); CHECK(send_initial_state_ == SendInitialState::kQueued); send_initial_metadata_batch_->payload->send_initial_metadata @@ -1735,10 +1694,8 @@ ArenaPromise ClientCallData::MakeNextPromise( // All polls: await receiving the trailing metadata, then return it to the // application. Poll ClientCallData::PollTrailingMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollTrailingMetadata %s", - LogTag().c_str(), DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " ClientCallData.PollTrailingMetadata " << DebugString(); CHECK_NE(poll_ctx_, nullptr); if (send_initial_state_ == SendInitialState::kQueued) { // First poll: pass the send_initial_metadata op down the stack. @@ -1786,14 +1743,10 @@ void ClientCallData::RecvTrailingMetadataReadyCallback( void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) { Flusher flusher(this); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ClientCallData.RecvTrailingMetadataReady " - "recv_trailing_state=%s error=%s md=%s", - LogTag().c_str(), StateString(recv_trailing_state_), - error.ToString().c_str(), - recv_trailing_metadata_->DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " ClientCallData.RecvTrailingMetadataReady " + << "recv_trailing_state=" << StateString(recv_trailing_state_) + << " error=" << error << " md=" << recv_trailing_metadata_->DebugString(); // If we were cancelled prior to receiving this callback, we should simply // forward the callback up with the same error. if (recv_trailing_state_ == RecvTrailingState::kCancelled) { @@ -2001,10 +1954,8 @@ ServerCallData::ServerCallData(grpc_call_element* elem, } ServerCallData::~ServerCallData() { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ~ServerCallData %s", LogTag().c_str(), - DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << " ~ServerCallData " << DebugString(); if (send_initial_metadata_ != nullptr) { send_initial_metadata_->~SendInitialMetadata(); } @@ -2012,7 +1963,7 @@ ServerCallData::~ServerCallData() { } std::string ServerCallData::DebugTag() const { - return absl::StrFormat("PBF_SERVER[%p]: [%s] ", this, elem()->filter->name); + return absl::StrFormat("PBF_SERVER[%p]: [%v] ", this, elem()->filter->name); } // Activity implementation. @@ -2029,10 +1980,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { Flusher flusher(this); bool wake = false; - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s StartBatch: %s", LogTag().c_str(), - DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString(); // If this is a cancel stream, cancel anything we have pending and // propagate the cancellation. @@ -2163,17 +2111,13 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Handle cancellation. void ServerCallData::Completed(grpc_error_handle error, bool tarpit_cancellation, Flusher* flusher) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_DEBUG, - "%sServerCallData::Completed: send_trailing_state=%s " - "send_initial_state=%s error=%s", - LogTag().c_str(), StateString(send_trailing_state_), - send_initial_metadata_ == nullptr - ? "null" - : SendInitialMetadata::StateString(send_initial_metadata_->state), - error.ToString().c_str()); - } + GRPC_TRACE_VLOG(channel, 2) + << LogTag() << "ServerCallData::Completed: send_trailing_state=" + << StateString(send_trailing_state_) << " send_initial_state=" + << (send_initial_metadata_ == nullptr + ? "null" + : SendInitialMetadata::StateString(send_initial_metadata_->state)) + << " error=" << error; // Track the latest reason for cancellation. cancelled_error_ = error; // Stop running the promise. @@ -2289,10 +2233,9 @@ ArenaPromise ServerCallData::MakeNextPromise( // All polls: await sending the trailing metadata, then foward it down the // stack. Poll ServerCallData::PollTrailingMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s PollTrailingMetadata: %s", LogTag().c_str(), - StateString(send_trailing_state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() + << " PollTrailingMetadata: " << StateString(send_trailing_state_); switch (send_trailing_state_) { case SendTrailingState::kInitial: case SendTrailingState::kQueuedBehindSendMessage: @@ -2320,11 +2263,9 @@ void ServerCallData::RecvTrailingMetadataReadyCallback( } void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: RecvTrailingMetadataReady error=%s md=%s", - LogTag().c_str(), error.ToString().c_str(), - recv_trailing_metadata_->DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": RecvTrailingMetadataReady error=" << error + << " md=" << recv_trailing_metadata_->DebugString(); Flusher flusher(this); PollContext poll_ctx(this, &flusher); Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(), @@ -2340,10 +2281,8 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg, void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) { Flusher flusher(this); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: RecvInitialMetadataReady %s", LogTag().c_str(), - error.ToString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": RecvInitialMetadataReady " << error; CHECK(recv_initial_state_ == RecvInitialState::kForwarded); // If there was an error we just propagate that through if (!error.ok()) { @@ -2405,10 +2344,8 @@ std::string ServerCallData::DebugString() const { // Wakeup and poll the promise if appropriate. void ServerCallData::WakeInsideCombiner(Flusher* flusher) { PollContext poll_ctx(this, flusher); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner %s", LogTag().c_str(), - DebugString().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": WakeInsideCombiner " << DebugString(); poll_ctx.ClearRepoll(); if (send_initial_metadata_ != nullptr) { if (send_initial_metadata_->state == @@ -2428,14 +2365,12 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { } if (send_initial_metadata_->metadata_push_.has_value()) { if ((*send_initial_metadata_->metadata_push_)().ready()) { - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner: metadata_push done", - LogTag().c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": WakeInsideCombiner: metadata_push done"; send_initial_metadata_->metadata_push_.reset(); - } else if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner: metadata_push pending", - LogTag().c_str()); + } else { + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": WakeInsideCombiner: metadata_push pending"; } } } @@ -2451,14 +2386,10 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { flusher, send_initial_metadata_ == nullptr || send_initial_metadata_->state == SendInitialMetadata::kForwarded); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_DEBUG, - "%s: After send_message WakeInsideCombiner %s is_idle=%s " - "is_forwarded=%s", - LogTag().c_str(), DebugString().c_str(), - send_message()->IsIdle() ? "true" : "false", - send_message()->IsForwarded() ? "true" : "false"); - } + GRPC_TRACE_VLOG(channel, 2) + << LogTag() << ": After send_message WakeInsideCombiner " + << DebugString() << " is_idle=" << send_message()->IsIdle() + << " is_forwarded=" << send_message()->IsForwarded(); if (send_trailing_state_ == SendTrailingState::kQueuedBehindSendMessage && (send_message()->IsIdle() || (send_trailing_metadata_batch_->send_message && @@ -2480,34 +2411,30 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { if (promise_.has_value()) { Poll poll; poll = promise_(); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_INFO, - "%s: WakeInsideCombiner poll=%s; send_initial_metadata=%s " - "send_trailing_metadata=%s", - LogTag().c_str(), - PollToString( - poll, - [](const ServerMetadataHandle& h) { return h->DebugString(); }) - .c_str(), - send_initial_metadata_ == nullptr - ? "null" - : SendInitialMetadata::StateString(send_initial_metadata_->state), - StateString(send_trailing_state_)); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": WakeInsideCombiner poll=" + << PollToString( + poll, + [](const ServerMetadataHandle& h) { return h->DebugString(); }) + .c_str() + << "; send_initial_metadata=" + << (send_initial_metadata_ == nullptr + ? "null" + : SendInitialMetadata::StateString( + send_initial_metadata_->state)) + << " send_trailing_metadata=" << StateString(send_trailing_state_); + if (send_initial_metadata_ != nullptr && send_initial_metadata_->state == SendInitialMetadata::kQueuedAndPushedToPipe) { CHECK(send_initial_metadata_->metadata_next_.has_value()); auto p = (*send_initial_metadata_->metadata_next_)(); - if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s: WakeInsideCombiner send_initial_metadata poll=%s", - LogTag().c_str(), - PollToString(p, [](const NextResult& h) { - return (*h)->DebugString(); - }).c_str()); - } + GRPC_TRACE_LOG(channel, INFO) + << LogTag() << ": WakeInsideCombiner send_initial_metadata poll=" + << PollToString(p, [](const NextResult& h) { + return (*h)->DebugString(); + }); + if (auto* nr = p.value_if_ready()) { ServerMetadataHandle md = std::move(nr->value()); if (send_initial_metadata_->batch->payload->send_initial_metadata diff --git a/deps/grpc/src/core/lib/channel/promise_based_filter.h b/deps/grpc/src/core/lib/channel/promise_based_filter.h index c40b1fb096..3c9c64dbaa 100644 --- a/deps/grpc/src/core/lib/channel/promise_based_filter.h +++ b/deps/grpc/src/core/lib/channel/promise_based_filter.h @@ -150,16 +150,6 @@ class ChannelFilter { virtual bool GetChannelInfo(const grpc_channel_info*) { return false; } virtual ~ChannelFilter() = default; - - grpc_event_engine::experimental::EventEngine* - hack_until_per_channel_stack_event_engines_land_get_event_engine() { - return event_engine_.get(); - } - - private: - // TODO(ctiller): remove once per-channel-stack EventEngines land - std::shared_ptr event_engine_ = - grpc_event_engine::experimental::GetDefaultEventEngine(); }; namespace promise_filter_detail { @@ -953,12 +943,11 @@ class BaseCallData : public Activity, private Wakeable { : promise_detail::Context(call_data->arena_), promise_detail::Context( call_data->pollent_.load(std::memory_order_acquire)), - promise_detail::Context(&call_data->finalization_), - promise_detail::Context( - call_data->event_engine_) {} + promise_detail::Context(&call_data->finalization_) { + } }; - class Flusher { + class Flusher : public latent_see::InnerScope { public: explicit Flusher(BaseCallData* call); // Calls closures, schedules batches, relinquishes call combiner. @@ -1305,7 +1294,6 @@ class BaseCallData : public Activity, private Wakeable { Pipe* const server_initial_metadata_pipe_; SendMessage* const send_message_; ReceiveMessage* const receive_message_; - grpc_event_engine::experimental::EventEngine* event_engine_; }; class ClientCallData : public BaseCallData { @@ -1659,7 +1647,7 @@ template absl::enable_if_t::value && !std::is_base_of::value, grpc_channel_filter> -MakePromiseBasedFilter(const char* name) { +MakePromiseBasedFilter() { using CallData = promise_filter_detail::CallData; return grpc_channel_filter{ @@ -1690,14 +1678,14 @@ MakePromiseBasedFilter(const char* name) { // get_channel_info promise_filter_detail::ChannelFilterMethods::GetChannelInfo, // name - name, + UniqueTypeNameFor(), }; } template absl::enable_if_t::value, grpc_channel_filter> -MakePromiseBasedFilter(const char* name) { +MakePromiseBasedFilter() { using CallData = promise_filter_detail::CallData; return grpc_channel_filter{ @@ -1728,7 +1716,7 @@ MakePromiseBasedFilter(const char* name) { // get_channel_info promise_filter_detail::ChannelFilterMethods::GetChannelInfo, // name - name, + UniqueTypeNameFor(), }; } diff --git a/deps/grpc/src/core/lib/compression/compression.cc b/deps/grpc/src/core/lib/compression/compression.cc index d3aa887846..018e92a379 100644 --- a/deps/grpc/src/core/lib/compression/compression.cc +++ b/deps/grpc/src/core/lib/compression/compression.cc @@ -29,7 +29,6 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/util/useful.h" int grpc_compression_algorithm_is_message(grpc_compression_algorithm) { @@ -54,8 +53,9 @@ int grpc_compression_algorithm_parse(grpc_slice name, int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, const char** name) { - GRPC_API_TRACE("grpc_compression_algorithm_name(algorithm=%d, name=%p)", 2, - ((int)algorithm, name)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_compression_algorithm_name(algorithm=" << (int)algorithm + << ", name=" << name << ")"; const char* result = grpc_core::CompressionAlgorithmAsString(algorithm); if (result != nullptr) { *name = result; diff --git a/deps/grpc/src/core/lib/compression/compression_internal.cc b/deps/grpc/src/core/lib/compression/compression_internal.cc index 6a2883f488..c643b1cd81 100644 --- a/deps/grpc/src/core/lib/compression/compression_internal.cc +++ b/deps/grpc/src/core/lib/compression/compression_internal.cc @@ -29,7 +29,6 @@ #include "absl/strings/str_split.h" #include -#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/deps/grpc/src/core/lib/config/config_vars.cc b/deps/grpc/src/core/lib/config/config_vars.cc index c67f4463f0..e0db62f5d0 100644 --- a/deps/grpc/src/core/lib/config/config_vars.cc +++ b/deps/grpc/src/core/lib/config/config_vars.cc @@ -55,9 +55,6 @@ ABSL_FLAG(std::vector, grpc_trace, {}, "into how gRPC C core is processing requests via debug logs."); ABSL_FLAG(absl::optional, grpc_verbosity, {}, "Logging verbosity."); -ABSL_FLAG(absl::optional, grpc_stacktrace_minloglevel, {}, - "Messages logged at the same or higher level than this will print " - "stacktrace"); ABSL_FLAG(absl::optional, grpc_enable_fork_support, {}, "Enable fork support"); ABSL_FLAG(absl::optional, grpc_poll_strategy, {}, @@ -75,6 +72,10 @@ ABSL_FLAG(absl::optional, grpc_not_use_system_ssl_roots, {}, "Disable loading system root certificates."); ABSL_FLAG(absl::optional, grpc_ssl_cipher_suites, {}, "A colon separated list of cipher suites to use with OpenSSL"); +ABSL_FLAG(absl::optional, grpc_cpp_experimental_disable_reflection, {}, + "EXPERIMENTAL. Only respected when there is a dependency on " + ":grpc++_reflection. If true, no reflection server will be " + "automatically added."); namespace grpc_core { @@ -92,14 +93,15 @@ ConfigVars::ConfigVars(const Overrides& overrides) not_use_system_ssl_roots_(LoadConfig( FLAGS_grpc_not_use_system_ssl_roots, "GRPC_NOT_USE_SYSTEM_SSL_ROOTS", overrides.not_use_system_ssl_roots, false)), + cpp_experimental_disable_reflection_( + LoadConfig(FLAGS_grpc_cpp_experimental_disable_reflection, + "GRPC_CPP_EXPERIMENTAL_DISABLE_REFLECTION", + overrides.cpp_experimental_disable_reflection, false)), dns_resolver_(LoadConfig(FLAGS_grpc_dns_resolver, "GRPC_DNS_RESOLVER", overrides.dns_resolver, "")), verbosity_(LoadConfig(FLAGS_grpc_verbosity, "GRPC_VERBOSITY", overrides.verbosity, GPR_DEFAULT_LOG_VERBOSITY_STRING)), - stacktrace_minloglevel_(LoadConfig(FLAGS_grpc_stacktrace_minloglevel, - "GRPC_STACKTRACE_MINLOGLEVEL", - overrides.stacktrace_minloglevel, "")), poll_strategy_(LoadConfig(FLAGS_grpc_poll_strategy, "GRPC_POLL_STRATEGY", overrides.poll_strategy, "all")), ssl_cipher_suites_(LoadConfig( @@ -134,8 +136,7 @@ std::string ConfigVars::ToString() const { ClientChannelBackupPollIntervalMs(), ", dns_resolver: ", "\"", absl::CEscape(DnsResolver()), "\"", ", trace: ", "\"", absl::CEscape(Trace()), "\"", ", verbosity: ", "\"", - absl::CEscape(Verbosity()), "\"", ", stacktrace_minloglevel: ", "\"", - absl::CEscape(StacktraceMinloglevel()), "\"", + absl::CEscape(Verbosity()), "\"", ", enable_fork_support: ", EnableForkSupport() ? "true" : "false", ", poll_strategy: ", "\"", absl::CEscape(PollStrategy()), "\"", ", abort_on_leaks: ", AbortOnLeaks() ? "true" : "false", @@ -143,7 +144,9 @@ std::string ConfigVars::ToString() const { "\"", ", default_ssl_roots_file_path: ", "\"", absl::CEscape(DefaultSslRootsFilePath()), "\"", ", not_use_system_ssl_roots: ", NotUseSystemSslRoots() ? "true" : "false", - ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\""); + ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"", + ", cpp_experimental_disable_reflection: ", + CppExperimentalDisableReflection() ? "true" : "false"); } } // namespace grpc_core diff --git a/deps/grpc/src/core/lib/config/config_vars.h b/deps/grpc/src/core/lib/config/config_vars.h index d368df239e..32220cd1f1 100644 --- a/deps/grpc/src/core/lib/config/config_vars.h +++ b/deps/grpc/src/core/lib/config/config_vars.h @@ -38,9 +38,9 @@ class GPR_DLL ConfigVars { absl::optional enable_fork_support; absl::optional abort_on_leaks; absl::optional not_use_system_ssl_roots; + absl::optional cpp_experimental_disable_reflection; absl::optional dns_resolver; absl::optional verbosity; - absl::optional stacktrace_minloglevel; absl::optional poll_strategy; absl::optional system_ssl_roots_dir; absl::optional default_ssl_roots_file_path; @@ -81,10 +81,6 @@ class GPR_DLL ConfigVars { absl::string_view Trace() const { return trace_; } // Logging verbosity. absl::string_view Verbosity() const { return verbosity_; } - // Messages logged at the same or higher level than this will print stacktrace - absl::string_view StacktraceMinloglevel() const { - return stacktrace_minloglevel_; - } // Enable fork support bool EnableForkSupport() const { return enable_fork_support_; } // Declares which polling engines to try when starting gRPC. This is a @@ -102,6 +98,12 @@ class GPR_DLL ConfigVars { bool NotUseSystemSslRoots() const { return not_use_system_ssl_roots_; } // A colon separated list of cipher suites to use with OpenSSL absl::string_view SslCipherSuites() const { return ssl_cipher_suites_; } + // EXPERIMENTAL. Only respected when there is a dependency on + // :grpc++_reflection. If true, no reflection server will be automatically + // added. + bool CppExperimentalDisableReflection() const { + return cpp_experimental_disable_reflection_; + } private: explicit ConfigVars(const Overrides& overrides); @@ -111,9 +113,9 @@ class GPR_DLL ConfigVars { bool enable_fork_support_; bool abort_on_leaks_; bool not_use_system_ssl_roots_; + bool cpp_experimental_disable_reflection_; std::string dns_resolver_; std::string verbosity_; - std::string stacktrace_minloglevel_; std::string poll_strategy_; std::string ssl_cipher_suites_; std::string experiments_; diff --git a/deps/grpc/src/core/lib/config/config_vars.yaml b/deps/grpc/src/core/lib/config/config_vars.yaml index afedf2f7b9..7246d8ba8b 100644 --- a/deps/grpc/src/core/lib/config/config_vars.yaml +++ b/deps/grpc/src/core/lib/config/config_vars.yaml @@ -72,12 +72,6 @@ description: Logging verbosity. fuzz: true -- name: stacktrace_minloglevel - type: string - default: - description: - Messages logged at the same or higher level than this will print stacktrace - fuzz: true - name: enable_fork_support type: bool description: Enable fork support @@ -126,3 +120,7 @@ ECDHE-ECDSA-AES256-GCM-SHA384:\ ECDHE-RSA-AES128-GCM-SHA256:\ ECDHE-RSA-AES256-GCM-SHA384" +- name: cpp_experimental_disable_reflection + type: bool + description: "EXPERIMENTAL. Only respected when there is a dependency on :grpc++_reflection. If true, no reflection server will be automatically added." + default: false diff --git a/deps/grpc/src/core/lib/config/core_configuration.cc b/deps/grpc/src/core/lib/config/core_configuration.cc index 7baa803bb4..474ec3b56c 100644 --- a/deps/grpc/src/core/lib/config/core_configuration.cc +++ b/deps/grpc/src/core/lib/config/core_configuration.cc @@ -20,7 +20,6 @@ #include "absl/log/check.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/lib/config/core_configuration.h b/deps/grpc/src/core/lib/config/core_configuration.h index 0d8b268cdd..400278bd5e 100644 --- a/deps/grpc/src/core/lib/config/core_configuration.h +++ b/deps/grpc/src/core/lib/config/core_configuration.h @@ -20,7 +20,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include #include #include "src/core/handshaker/handshaker_registry.h" diff --git a/deps/grpc/src/core/lib/debug/event_log.cc b/deps/grpc/src/core/lib/debug/event_log.cc index 76edac8584..48dbb5809a 100644 --- a/deps/grpc/src/core/lib/debug/event_log.cc +++ b/deps/grpc/src/core/lib/debug/event_log.cc @@ -21,7 +21,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/lib/debug/trace.cc b/deps/grpc/src/core/lib/debug/trace.cc index 78b79eb968..642976a0e6 100644 --- a/deps/grpc/src/core/lib/debug/trace.cc +++ b/deps/grpc/src/core/lib/debug/trace.cc @@ -30,7 +30,6 @@ #include "absl/strings/strip.h" #include -#include #include #include "src/core/lib/config/config_vars.h" @@ -41,7 +40,7 @@ int grpc_tracer_set_enabled(const char* name, int enabled); namespace grpc_core { namespace { void LogAllTracers() { - gpr_log(GPR_DEBUG, "available tracers:"); + VLOG(2) << "available tracers:"; for (const auto& name : GetAllTraceFlags()) { LOG(INFO) << " " << name.first; } diff --git a/deps/grpc/src/core/lib/debug/trace_flags.cc b/deps/grpc/src/core/lib/debug/trace_flags.cc index 05ef50af0e..85b5f6f9ee 100644 --- a/deps/grpc/src/core/lib/debug/trace_flags.cc +++ b/deps/grpc/src/core/lib/debug/trace_flags.cc @@ -26,6 +26,7 @@ namespace grpc_core { DebugOnlyTraceFlag auth_context_refcount_trace(false, "auth_context_refcount"); DebugOnlyTraceFlag call_combiner_trace(false, "call_combiner"); DebugOnlyTraceFlag call_refcount_trace(false, "call_refcount"); +DebugOnlyTraceFlag call_state_trace(false, "call_state"); DebugOnlyTraceFlag closure_trace(false, "closure"); DebugOnlyTraceFlag combiner_trace(false, "combiner"); DebugOnlyTraceFlag cq_refcount_trace(false, "cq_refcount"); @@ -113,6 +114,7 @@ TraceFlag subchannel_pool_trace(false, "subchannel_pool"); TraceFlag tcp_trace(false, "tcp"); TraceFlag timer_trace(false, "timer"); TraceFlag timer_check_trace(false, "timer_check"); +TraceFlag token_fetcher_credentials_trace(false, "token_fetcher_credentials"); TraceFlag tsi_trace(false, "tsi"); TraceFlag weighted_round_robin_lb_trace(false, "weighted_round_robin_lb"); TraceFlag weighted_target_lb_trace(false, "weighted_target_lb"); @@ -120,18 +122,10 @@ TraceFlag xds_client_trace(false, "xds_client"); TraceFlag xds_client_refcount_trace(false, "xds_client_refcount"); TraceFlag xds_cluster_impl_lb_trace(false, "xds_cluster_impl_lb"); TraceFlag xds_cluster_manager_lb_trace(false, "xds_cluster_manager_lb"); -TraceFlag xds_cluster_resource_type_test_trace( - true, "xds_cluster_resource_type_test"); -TraceFlag xds_common_types_test_trace(true, "xds_common_types_test"); -TraceFlag xds_endpoint_resource_type_test_trace( - true, "xds_endpoint_resource_type_test"); -TraceFlag xds_listener_resource_type_test_trace( - true, "xds_listener_resource_type_test"); TraceFlag xds_override_host_lb_trace(false, "xds_override_host_lb"); TraceFlag xds_resolver_trace(false, "xds_resolver"); -TraceFlag xds_route_config_resource_type_test_trace( - true, "xds_route_config_resource_type_test"); TraceFlag xds_server_config_fetcher_trace(false, "xds_server_config_fetcher"); +TraceFlag xds_unittest_trace(true, "xds_unittest"); TraceFlag xds_wrr_locality_lb_trace(false, "xds_wrr_locality_lb"); const absl::flat_hash_map& GetAllTraceFlags() { @@ -205,6 +199,7 @@ const absl::flat_hash_map& GetAllTraceFlags() { {"tcp", &tcp_trace}, {"timer", &timer_trace}, {"timer_check", &timer_check_trace}, + {"token_fetcher_credentials", &token_fetcher_credentials_trace}, {"tsi", &tsi_trace}, {"weighted_round_robin_lb", &weighted_round_robin_lb_trace}, {"weighted_target_lb", &weighted_target_lb_trace}, @@ -212,23 +207,16 @@ const absl::flat_hash_map& GetAllTraceFlags() { {"xds_client_refcount", &xds_client_refcount_trace}, {"xds_cluster_impl_lb", &xds_cluster_impl_lb_trace}, {"xds_cluster_manager_lb", &xds_cluster_manager_lb_trace}, - {"xds_cluster_resource_type_test", - &xds_cluster_resource_type_test_trace}, - {"xds_common_types_test", &xds_common_types_test_trace}, - {"xds_endpoint_resource_type_test", - &xds_endpoint_resource_type_test_trace}, - {"xds_listener_resource_type_test", - &xds_listener_resource_type_test_trace}, {"xds_override_host_lb", &xds_override_host_lb_trace}, {"xds_resolver", &xds_resolver_trace}, - {"xds_route_config_resource_type_test", - &xds_route_config_resource_type_test_trace}, {"xds_server_config_fetcher", &xds_server_config_fetcher_trace}, + {"xds_unittest", &xds_unittest_trace}, {"xds_wrr_locality_lb", &xds_wrr_locality_lb_trace}, #ifndef NDEBUG {"auth_context_refcount", &auth_context_refcount_trace}, {"call_combiner", &call_combiner_trace}, {"call_refcount", &call_refcount_trace}, + {"call_state", &call_state_trace}, {"closure", &closure_trace}, {"combiner", &combiner_trace}, {"cq_refcount", &cq_refcount_trace}, diff --git a/deps/grpc/src/core/lib/debug/trace_flags.h b/deps/grpc/src/core/lib/debug/trace_flags.h index 65d59df507..f185adb65e 100644 --- a/deps/grpc/src/core/lib/debug/trace_flags.h +++ b/deps/grpc/src/core/lib/debug/trace_flags.h @@ -26,6 +26,7 @@ namespace grpc_core { extern DebugOnlyTraceFlag auth_context_refcount_trace; extern DebugOnlyTraceFlag call_combiner_trace; extern DebugOnlyTraceFlag call_refcount_trace; +extern DebugOnlyTraceFlag call_state_trace; extern DebugOnlyTraceFlag closure_trace; extern DebugOnlyTraceFlag combiner_trace; extern DebugOnlyTraceFlag cq_refcount_trace; @@ -111,6 +112,7 @@ extern TraceFlag subchannel_pool_trace; extern TraceFlag tcp_trace; extern TraceFlag timer_trace; extern TraceFlag timer_check_trace; +extern TraceFlag token_fetcher_credentials_trace; extern TraceFlag tsi_trace; extern TraceFlag weighted_round_robin_lb_trace; extern TraceFlag weighted_target_lb_trace; @@ -118,14 +120,10 @@ extern TraceFlag xds_client_trace; extern TraceFlag xds_client_refcount_trace; extern TraceFlag xds_cluster_impl_lb_trace; extern TraceFlag xds_cluster_manager_lb_trace; -extern TraceFlag xds_cluster_resource_type_test_trace; -extern TraceFlag xds_common_types_test_trace; -extern TraceFlag xds_endpoint_resource_type_test_trace; -extern TraceFlag xds_listener_resource_type_test_trace; extern TraceFlag xds_override_host_lb_trace; extern TraceFlag xds_resolver_trace; -extern TraceFlag xds_route_config_resource_type_test_trace; extern TraceFlag xds_server_config_fetcher_trace; +extern TraceFlag xds_unittest_trace; extern TraceFlag xds_wrr_locality_lb_trace; } // namespace grpc_core diff --git a/deps/grpc/src/core/lib/debug/trace_flags.yaml b/deps/grpc/src/core/lib/debug/trace_flags.yaml index 8260daf561..11889710dc 100644 --- a/deps/grpc/src/core/lib/debug/trace_flags.yaml +++ b/deps/grpc/src/core/lib/debug/trace_flags.yaml @@ -54,6 +54,10 @@ call_refcount: debug_only: true default: false description: Refcount on call. +call_state: + debug_only: true + default: false + description: Traces transitions through the call spine state machine. cares_address_sorting: default: false description: Operations of the c-ares based DNS resolver's address sorter. @@ -304,6 +308,9 @@ timer: timer_check: default: false description: more detailed trace of timer logic in grpc internals. +token_fetcher_credentials: + default: false + description: Token fetcher call credentials framework, used for (e.g.) oauth2 token fetcher credentials. tsi: default: false description: TSI transport security. @@ -329,35 +336,19 @@ xds_cluster_impl_lb: xds_cluster_manager_lb: default: false description: XDS Cluster manager LB policy. -xds_cluster_resource_type_test: - default: true - description: XDS Cluster resource type. - internal: true -xds_common_types_test: - default: true - description: XDS Common types. - internal: true -xds_endpoint_resource_type_test: - default: true - description: XDS Endpoint resource type. - internal: true -xds_listener_resource_type_test: - default: true - description: XDS Listener resource type. - internal: true xds_override_host_lb: default: false description: XDS Override host LB. xds_resolver: default: false description: XDS Resolver. -xds_route_config_resource_type_test: - default: true - description: XDS Route config resource type. - internal: true xds_server_config_fetcher: default: false description: XDS Server config fetcher. +xds_unittest: + default: true + description: xDS unit tests. + internal: true xds_wrr_locality_lb: default: false description: XDS WRR locality LB policy. diff --git a/deps/grpc/src/core/lib/debug/trace_impl.h b/deps/grpc/src/core/lib/debug/trace_impl.h index 705e2bbe57..4d91c374d0 100644 --- a/deps/grpc/src/core/lib/debug/trace_impl.h +++ b/deps/grpc/src/core/lib/debug/trace_impl.h @@ -25,6 +25,10 @@ #include +#ifdef _WIN32 +#undef ERROR +#endif + void grpc_tracer_init(); void grpc_tracer_shutdown(void); @@ -77,10 +81,16 @@ class TraceFlag { }; #define GRPC_TRACE_FLAG_ENABLED_OBJ(obj) GPR_UNLIKELY((obj).enabled()) + #define GRPC_TRACE_FLAG_ENABLED(tracer) \ GPR_UNLIKELY((grpc_core::tracer##_trace).enabled()) + #define GRPC_TRACE_LOG(tracer, level) \ LOG_IF(level, GRPC_TRACE_FLAG_ENABLED(tracer)) + +#define GRPC_TRACE_DLOG(tracer, level) \ + DLOG_IF(level, GRPC_TRACE_FLAG_ENABLED(tracer)) + #define GRPC_TRACE_VLOG(tracer, level) \ if (GRPC_TRACE_FLAG_ENABLED(tracer)) VLOG(level) diff --git a/deps/grpc/src/core/lib/event_engine/ares_resolver.cc b/deps/grpc/src/core/lib/event_engine/ares_resolver.cc index 7fb665d744..1cd7c73f54 100644 --- a/deps/grpc/src/core/lib/event_engine/ares_resolver.cc +++ b/deps/grpc/src/core/lib/event_engine/ares_resolver.cc @@ -61,10 +61,10 @@ #include "absl/types/optional.h" #include -#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/time_util.h" @@ -83,6 +83,11 @@ namespace experimental { namespace { +// A hard limit on the number of records (A/AAAA or SRV) we may get from a +// single response. This is to be defensive to prevent a bad DNS response from +// OOMing the process. +constexpr int kMaxRecordSize = 65536; + absl::Status AresStatusToAbslStatus(int status, absl::string_view error_msg) { switch (status) { case ARES_ECANCELLED: @@ -91,6 +96,8 @@ absl::Status AresStatusToAbslStatus(int status, absl::string_view error_msg) { return absl::UnimplementedError(error_msg); case ARES_ENOTFOUND: return absl::NotFoundError(error_msg); + case ARES_ECONNREFUSED: + return absl::UnavailableError(error_msg); default: return absl::UnknownError(error_msg); } @@ -116,7 +123,8 @@ bool IsIpv6LoopbackAvailable() { absl::Status SetRequestDNSServer(absl::string_view dns_server, ares_channel* channel) { - GRPC_ARES_RESOLVER_TRACE_LOG("Using DNS server %s", dns_server.data()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) Using DNS server " << dns_server; grpc_resolved_address addr; struct ares_addr_port_node dns_server_addr = {}; if (grpc_parse_ipv4_hostport(dns_server, &addr, /*log_errors=*/false)) { @@ -243,8 +251,9 @@ void AresResolver::Orphan() { } for (const auto& fd_node : fd_node_list_) { if (!fd_node->already_shutdown) { - GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p shutdown fd: %s", this, - fd_node->polled_fd->GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver: " << this + << " shutdown fd: " << fd_node->polled_fd->GetName(); CHECK(fd_node->polled_fd->ShutdownLocked( absl::CancelledError("AresResolver::Orphan"))); fd_node->already_shutdown = true; @@ -415,8 +424,9 @@ void AresResolver::CheckSocketsLocked() { fd_node_list_.begin(), fd_node_list_.end(), [sock = socks[i]](const auto& node) { return node->as == sock; }); if (iter == fd_node_list_.end()) { - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p new fd: %d", this, - socks[i]); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << this + << " new fd: " << socks[i]; new_list.push_back(std::make_unique( socks[i], polled_fd_factory_->NewGrpcPolledFdLocked(socks[i]))); } else { @@ -432,8 +442,9 @@ void AresResolver::CheckSocketsLocked() { // to cope with the edge-triggered poller not getting an event if no // new data arrives and c-ares hasn't read all the data in the // previous ares_process_fd. - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p schedule read directly on: %d", this, fd_node->as); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << this + << " schedule read directly on: " << fd_node->as; event_engine_->Run( [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"), fd_node]() mutable { @@ -442,8 +453,9 @@ void AresResolver::CheckSocketsLocked() { }); } else { // Otherwise register with the poller for readable event. - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p notify read on: %d", this, - fd_node->as); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << this + << " notify read on: " << fd_node->as; fd_node->polled_fd->RegisterForOnReadableLocked( [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"), fd_node](absl::Status status) mutable { @@ -456,8 +468,9 @@ void AresResolver::CheckSocketsLocked() { // has not been registered with this socket. if (ARES_GETSOCK_WRITABLE(socks_bitmask, i) && !fd_node->writable_registered) { - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p notify write on: %d", this, - fd_node->as); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << this + << " notify write on: " << fd_node->as; fd_node->writable_registered = true; fd_node->polled_fd->RegisterForOnWriteableLocked( [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"), @@ -479,14 +492,16 @@ void AresResolver::CheckSocketsLocked() { while (!fd_node_list_.empty()) { FdNode* fd_node = fd_node_list_.front().get(); if (!fd_node->already_shutdown) { - GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p shutdown fd: %s", this, - fd_node->polled_fd->GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver: " << this + << " shutdown fd: " << fd_node->polled_fd->GetName(); fd_node->already_shutdown = fd_node->polled_fd->ShutdownLocked(absl::OkStatus()); } if (!fd_node->readable_registered && !fd_node->writable_registered) { - GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p delete fd: %s", this, - fd_node->polled_fd->GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver: " << this + << " delete fd: " << fd_node->polled_fd->GetName(); fd_node_list_.pop_front(); } else { new_list.splice(new_list.end(), fd_node_list_, fd_node_list_.begin()); @@ -500,9 +515,10 @@ void AresResolver::MaybeStartTimerLocked() { return; } // Initialize the backup poll alarm - GRPC_ARES_RESOLVER_TRACE_LOG( - "request:%p MaybeStartTimerLocked next ares process poll time in %zu ms", - this, Milliseconds(kAresBackupPollAlarmDuration)); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) request:" << this + << " MaybeStartTimerLocked next ares process poll time in " + << Milliseconds(kAresBackupPollAlarmDuration) << " ms"; ares_backup_poll_alarm_handle_ = event_engine_->RunAfter( kAresBackupPollAlarmDuration, [self = Ref(DEBUG_LOCATION, "MaybeStartTimerLocked")]() { @@ -514,8 +530,9 @@ void AresResolver::OnReadable(FdNode* fd_node, absl::Status status) { grpc_core::MutexLock lock(&mutex_); CHECK(fd_node->readable_registered); fd_node->readable_registered = false; - GRPC_ARES_RESOLVER_TRACE_LOG("OnReadable: fd: %d; request: %p; status: %s", - fd_node->as, this, status.ToString().c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) OnReadable: fd: " << fd_node->as + << "; request: " << this << "; status: " << status; if (status.ok() && !shutting_down_) { ares_process_fd(channel_, fd_node->as, ARES_SOCKET_BAD); } else { @@ -533,8 +550,9 @@ void AresResolver::OnWritable(FdNode* fd_node, absl::Status status) { grpc_core::MutexLock lock(&mutex_); CHECK(fd_node->writable_registered); fd_node->writable_registered = false; - GRPC_ARES_RESOLVER_TRACE_LOG("OnWritable: fd: %d; request:%p; status: %s", - fd_node->as, this, status.ToString().c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) OnWritable: fd: " << fd_node->as + << "; request:" << this << "; status: " << status; if (status.ok() && !shutting_down_) { ares_process_fd(channel_, ARES_SOCKET_BAD, fd_node->as); } else { @@ -559,15 +577,16 @@ void AresResolver::OnWritable(FdNode* fd_node, absl::Status status) { void AresResolver::OnAresBackupPollAlarm() { grpc_core::MutexLock lock(&mutex_); ares_backup_poll_alarm_handle_.reset(); - GRPC_ARES_RESOLVER_TRACE_LOG( - "request:%p OnAresBackupPollAlarm shutting_down=%d.", this, - shutting_down_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) request:" << this + << " OnAresBackupPollAlarm shutting_down=" << shutting_down_; if (!shutting_down_) { for (const auto& fd_node : fd_node_list_) { if (!fd_node->already_shutdown) { - GRPC_ARES_RESOLVER_TRACE_LOG( - "request:%p OnAresBackupPollAlarm; ares_process_fd. fd=%s", this, - fd_node->polled_fd->GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) request:" << this + << " OnAresBackupPollAlarm; ares_process_fd. fd=" + << fd_node->polled_fd->GetName(); ares_socket_t as = fd_node->polled_fd->GetWrappedAresSocketLocked(); ares_process_fd(channel_, as, as); } @@ -587,14 +606,20 @@ void AresResolver::OnHostbynameDoneLocked(void* arg, int status, std::string error_msg = absl::StrFormat("address lookup failed for %s: %s", hostname_qa->query_name, ares_strerror(status)); - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p OnHostbynameDoneLocked: %s", - ares_resolver, error_msg.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " OnHostbynameDoneLocked: " << error_msg; hostname_qa->error_status = AresStatusToAbslStatus(status, error_msg); } else { - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p OnHostbynameDoneLocked name=%s ARES_SUCCESS", - ares_resolver, hostname_qa->query_name.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " OnHostbynameDoneLocked name=" << hostname_qa->query_name + << " ARES_SUCCESS"; for (size_t i = 0; hostent->h_addr_list[i] != nullptr; i++) { + if (hostname_qa->result.size() == kMaxRecordSize) { + LOG(ERROR) << "A/AAAA response exceeds maximum record size of 65536"; + break; + } switch (hostent->h_addrtype) { case AF_INET6: { size_t addr_len = sizeof(struct sockaddr_in6); @@ -608,10 +633,11 @@ void AresResolver::OnHostbynameDoneLocked(void* arg, int status, reinterpret_cast(&addr), addr_len); char output[INET6_ADDRSTRLEN]; ares_inet_ntop(AF_INET6, &addr.sin6_addr, output, INET6_ADDRSTRLEN); - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p c-ares resolver gets a AF_INET6 result: \n" - " addr: %s\n port: %d\n sin6_scope_id: %d\n", - ares_resolver, output, hostname_qa->port, addr.sin6_scope_id); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " c-ares resolver gets a AF_INET6 result: \n addr: " << output + << "\n port: " << hostname_qa->port + << "\n sin6_scope_id: " << addr.sin6_scope_id; break; } case AF_INET: { @@ -626,10 +652,10 @@ void AresResolver::OnHostbynameDoneLocked(void* arg, int status, reinterpret_cast(&addr), addr_len); char output[INET_ADDRSTRLEN]; ares_inet_ntop(AF_INET, &addr.sin_addr, output, INET_ADDRSTRLEN); - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p c-ares resolver gets a AF_INET result: \n" - " addr: %s\n port: %d\n", - ares_resolver, output, hostname_qa->port); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " c-ares resolver gets a AF_INET result: \n addr: " << output + << "\n port: " << hostname_qa->port; break; } default: @@ -677,8 +703,9 @@ void AresResolver::OnSRVQueryDoneLocked(void* arg, int status, int /*timeouts*/, auto fail = [&](absl::string_view prefix) { std::string error_message = absl::StrFormat( "%s for %s: %s", prefix, qa->query_name, ares_strerror(status)); - GRPC_ARES_RESOLVER_TRACE_LOG("OnSRVQueryDoneLocked: %s", - error_message.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) OnSRVQueryDoneLocked: " + << error_message; ares_resolver->event_engine_->Run( [callback = std::move(callback), status = AresStatusToAbslStatus(status, error_message)]() mutable { @@ -689,13 +716,14 @@ void AresResolver::OnSRVQueryDoneLocked(void* arg, int status, int /*timeouts*/, fail("SRV lookup failed"); return; } - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p OnSRVQueryDoneLocked name=%s ARES_SUCCESS", ares_resolver, - qa->query_name.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " OnSRVQueryDoneLocked name=" << qa->query_name << " ARES_SUCCESS"; struct ares_srv_reply* reply = nullptr; status = ares_parse_srv_reply(abuf, alen, &reply); - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p ares_parse_srv_reply: %d", - ares_resolver, status); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " ares_parse_srv_reply: " << status; if (status != ARES_SUCCESS) { fail("Failed to parse SRV reply"); return; @@ -703,6 +731,10 @@ void AresResolver::OnSRVQueryDoneLocked(void* arg, int status, int /*timeouts*/, std::vector result; for (struct ares_srv_reply* srv_it = reply; srv_it != nullptr; srv_it = srv_it->next) { + if (result.size() == kMaxRecordSize) { + LOG(ERROR) << "SRV response exceeds maximum record size of 65536"; + break; + } EventEngine::DNSResolver::SRVRecord record; record.host = srv_it->host; record.port = srv_it->port; @@ -732,8 +764,9 @@ void AresResolver::OnTXTDoneLocked(void* arg, int status, int /*timeouts*/, auto fail = [&](absl::string_view prefix) { std::string error_message = absl::StrFormat( "%s for %s: %s", prefix, qa->query_name, ares_strerror(status)); - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p OnTXTDoneLocked: %s", - ares_resolver, error_message.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " OnTXTDoneLocked: " << error_message; ares_resolver->event_engine_->Run( [callback = std::move(callback), status = AresStatusToAbslStatus(status, error_message)]() mutable { @@ -744,9 +777,9 @@ void AresResolver::OnTXTDoneLocked(void* arg, int status, int /*timeouts*/, fail("TXT lookup failed"); return; } - GRPC_ARES_RESOLVER_TRACE_LOG( - "resolver:%p OnTXTDoneLocked name=%s ARES_SUCCESS", ares_resolver, - qa->query_name.c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver + << " OnTXTDoneLocked name=" << qa->query_name << " ARES_SUCCESS"; struct ares_txt_ext* reply = nullptr; status = ares_parse_txt_reply_ext(buf, len, &reply); if (status != ARES_SUCCESS) { @@ -763,8 +796,9 @@ void AresResolver::OnTXTDoneLocked(void* arg, int status, int /*timeouts*/, std::string(reinterpret_cast(part->txt), part->length)); } } - GRPC_ARES_RESOLVER_TRACE_LOG("resolver:%p Got %zu TXT records", ares_resolver, - result.size()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) resolver:" << ares_resolver << " Got " + << result.size() << " TXT records"; if (GRPC_TRACE_FLAG_ENABLED(cares_resolver)) { for (const auto& record : result) { LOG(INFO) << record; @@ -788,4 +822,50 @@ void (*event_engine_grpc_ares_test_only_inject_config)(ares_channel* channel) = bool g_event_engine_grpc_ares_test_only_force_tcp = false; +bool ShouldUseAresDnsResolver() { +#if defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || \ + defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) + auto resolver_env = grpc_core::ConfigVars::Get().DnsResolver(); + return resolver_env.empty() || absl::EqualsIgnoreCase(resolver_env, "ares"); +#else // defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || + // defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) + return false; +#endif // defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || + // defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) +} + +absl::Status AresInit() { + if (ShouldUseAresDnsResolver()) { + address_sorting_init(); + // ares_library_init and ares_library_cleanup are currently no-op except + // under Windows. Calling them may cause race conditions when other parts of + // the binary calls these functions concurrently. +#ifdef GPR_WINDOWS + int status = ares_library_init(ARES_LIB_INIT_ALL); + if (status != ARES_SUCCESS) { + return GRPC_ERROR_CREATE( + absl::StrCat("ares_library_init failed: ", ares_strerror(status))); + } +#endif // GPR_WINDOWS + } + return absl::OkStatus(); +} +void AresShutdown() { + if (ShouldUseAresDnsResolver()) { + address_sorting_shutdown(); + // ares_library_init and ares_library_cleanup are currently no-op except + // under Windows. Calling them may cause race conditions when other parts of + // the binary calls these functions concurrently. +#ifdef GPR_WINDOWS + ares_library_cleanup(); +#endif // GPR_WINDOWS + } +} + +#else // GRPC_ARES == 1 + +bool ShouldUseAresDnsResolver() { return false; } +absl::Status AresInit() { return absl::OkStatus(); } +void AresShutdown() {} + #endif // GRPC_ARES == 1 diff --git a/deps/grpc/src/core/lib/event_engine/ares_resolver.h b/deps/grpc/src/core/lib/event_engine/ares_resolver.h index b0e1f3c06c..c36cf49f76 100644 --- a/deps/grpc/src/core/lib/event_engine/ares_resolver.h +++ b/deps/grpc/src/core/lib/event_engine/ares_resolver.h @@ -16,6 +16,8 @@ #include +#include "absl/status/status.h" + #include #include "src/core/lib/debug/trace.h" @@ -29,14 +31,12 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" -#include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include -#include #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" @@ -46,13 +46,6 @@ namespace grpc_event_engine { namespace experimental { -#define GRPC_ARES_RESOLVER_TRACE_LOG(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(cares_resolver)) { \ - gpr_log(GPR_INFO, "(EventEngine c-ares resolver) " format, __VA_ARGS__); \ - } \ - } while (0) - class AresResolver : public RefCountedDNSResolverInterface { public: static absl::StatusOr> @@ -146,4 +139,9 @@ extern void (*event_engine_grpc_ares_test_only_inject_config)( extern bool g_event_engine_grpc_ares_test_only_force_tcp; #endif // GRPC_ARES == 1 + +bool ShouldUseAresDnsResolver(); +absl::Status AresInit(); +void AresShutdown(); + #endif // GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H diff --git a/deps/grpc/src/core/lib/event_engine/cf_engine/cf_engine.cc b/deps/grpc/src/core/lib/event_engine/cf_engine/cf_engine.cc index 83f4a57aca..ffd936cd51 100644 --- a/deps/grpc/src/core/lib/event_engine/cf_engine/cf_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -21,6 +21,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include @@ -30,7 +31,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/gprpp/crash.h" @@ -44,8 +44,8 @@ struct CFEventEngine::Closure final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE("CFEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "CFEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->task_mu_); engine->known_handles_.erase(handle); @@ -65,9 +65,9 @@ CFEventEngine::~CFEventEngine() { grpc_core::MutexLock lock(&task_mu_); if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "CFEventEngine:%p uncleared TaskHandle at shutdown:%s", this, - HandleToString(handle).c_str()); + LOG(ERROR) << "CFEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } CHECK(GPR_LIKELY(known_handles_.empty())); @@ -145,9 +145,8 @@ bool CFEventEngine::CancelConnectInternal(ConnectionHandle handle, grpc_core::MutexLock lock(&conn_mu_); if (!conn_handles_.contains(handle)) { - GRPC_EVENT_ENGINE_TRACE( - "Unknown connection handle: %s", - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Unknown connection handle: " << handle; return false; } conn_handles_.erase(handle); @@ -210,8 +209,8 @@ EventEngine::TaskHandle CFEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&task_mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE("CFEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "CFEventEngine:" << this << " scheduling callback:" << handle; timer_manager_.TimerInit(&cd->timer, when_ts, cd); return handle; } diff --git a/deps/grpc/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/deps/grpc/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index a2307fe36f..4721437860 100644 --- a/deps/grpc/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/deps/grpc/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/strerror.h" namespace grpc_event_engine { @@ -68,9 +67,9 @@ absl::StatusOr CFReadStreamLocallAddress( } // namespace bool CFStreamEndpointImpl::CancelConnect(absl::Status status) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::CancelConnect: status: %s, this: %p", - status.ToString().c_str(), this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::CancelConnect: status: " << status + << ", this: " << this; return open_event_.SetShutdown(std::move(status)); } @@ -85,8 +84,8 @@ void CFStreamEndpointImpl::Connect( return; } - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Connect: %s", - addr_uri.value().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Connect: " << addr_uri.value(); peer_address_ = std::move(addr); auto host_port = ResolvedAddressToNormalizedString(peer_address_); @@ -96,8 +95,8 @@ void CFStreamEndpointImpl::Connect( } peer_address_string_ = host_port.value(); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::Connect, host_port: %s", host_port->c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Connect, host_port: " << peer_address_string_; std::string host_string; std::string port_string; @@ -163,8 +162,9 @@ void CFStreamEndpointImpl::Connect( void* client_callback_info) { auto self = static_cast(client_callback_info); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::ReadCallback, type: %lu, this: %p", type, self); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::ReadCallback, type: " << type + << ", this: " << self; switch (type) { case kCFStreamEventOpenCompleted: @@ -177,8 +177,8 @@ void CFStreamEndpointImpl::Connect( break; case kCFStreamEventErrorOccurred: { auto status = CFErrorToStatus(CFReadStreamCopyError(stream)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream Read error: %s", - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream Read error: " << status; self->open_event_.SetShutdown(status); self->read_event_.SetShutdown(status); @@ -194,8 +194,9 @@ void CFStreamEndpointImpl::WriteCallback(CFWriteStreamRef stream, CFStreamEventType type, void* client_callback_info) { auto self = static_cast(client_callback_info); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::WriteCallback, type: %lu, this: %p", type, self); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::WriteCallback, type: " << type + << ", this: " << self; switch (type) { case kCFStreamEventOpenCompleted: @@ -208,8 +209,8 @@ void CFStreamEndpointImpl::WriteCallback(CFWriteStreamRef stream, break; case kCFStreamEventErrorOccurred: { auto status = CFErrorToStatus(CFWriteStreamCopyError(stream)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream Write error: %s", - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream Write error: " << status; self->open_event_.SetShutdown(status); self->read_event_.SetShutdown(status); @@ -239,8 +240,8 @@ CFStreamEndpointImpl::~CFStreamEndpointImpl() { } void CFStreamEndpointImpl::Shutdown() { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Shutdown: this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Shutdown: this: " << this; auto shutdownStatus = absl::Status(absl::StatusCode::kUnknown, @@ -259,8 +260,8 @@ void CFStreamEndpointImpl::Shutdown() { bool CFStreamEndpointImpl::Read( absl::AnyInvocable on_read, SliceBuffer* buffer, const EventEngine::Endpoint::ReadArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Read, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Read, this: " << this; read_event_.NotifyOn(new PosixEngineClosure( [that = Ref(), on_read = std::move(on_read), @@ -278,8 +279,8 @@ bool CFStreamEndpointImpl::Read( void CFStreamEndpointImpl::DoRead( absl::AnyInvocable on_read, SliceBuffer* buffer) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::DoRead, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::DoRead, this: " << this; auto buffer_index = buffer->AppendIndexed( Slice(memory_allocator_.MakeSlice(kDefaultReadBufferSize))); @@ -292,8 +293,8 @@ void CFStreamEndpointImpl::DoRead( if (read_size < 0) { auto status = CFErrorToStatus(CFReadStreamCopyError(cf_read_stream_)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream read error: %s, read_size: %ld", - status.ToString().c_str(), read_size); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream read error: " << status << ", read_size: " << read_size; on_read(status); return; } @@ -305,8 +306,8 @@ void CFStreamEndpointImpl::DoRead( bool CFStreamEndpointImpl::Write( absl::AnyInvocable on_writable, SliceBuffer* data, const EventEngine::Endpoint::WriteArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Write, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Write, this: " << this; write_event_.NotifyOn(new PosixEngineClosure( [that = Ref(), on_writable = std::move(on_writable), @@ -324,15 +325,28 @@ bool CFStreamEndpointImpl::Write( void CFStreamEndpointImpl::DoWrite( absl::AnyInvocable on_writable, SliceBuffer* data) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::DoWrite, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::DoWrite, this: " << this; size_t total_written_size = 0; for (size_t i = 0; i < data->Count(); i++) { auto slice = data->RefSlice(i); - size_t written_size = + if (slice.size() == 0) { + continue; + } + + CFIndex written_size = CFWriteStreamWrite(cf_write_stream_, slice.begin(), slice.size()); + if (written_size < 0) { + auto status = CFErrorToStatus(CFWriteStreamCopyError(cf_write_stream_)); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream write error: " << status + << ", written_size: " << written_size; + on_writable(status); + return; + } + total_written_size += written_size; if (written_size < slice.size()) { SliceBuffer written; diff --git a/deps/grpc/src/core/lib/event_engine/cf_engine/cftype_unique_ref.h b/deps/grpc/src/core/lib/event_engine/cf_engine/cftype_unique_ref.h index 04953cade2..5deb68f327 100644 --- a/deps/grpc/src/core/lib/event_engine/cf_engine/cftype_unique_ref.h +++ b/deps/grpc/src/core/lib/event_engine/cf_engine/cftype_unique_ref.h @@ -37,7 +37,7 @@ class CFTypeUniqueRef { CFTypeUniqueRef(CFTypeUniqueRef const&) = delete; CFTypeUniqueRef& operator=(CFTypeUniqueRef const&) = delete; - CFTypeUniqueRef(CFTypeUniqueRef&& other) : cf_type_ref_(other.release()){}; + CFTypeUniqueRef(CFTypeUniqueRef&& other) : cf_type_ref_(other.release()) {}; CFTypeUniqueRef& operator=(CFTypeUniqueRef&& other) { reset(other.release()); return *this; diff --git a/deps/grpc/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/deps/grpc/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc index 3a8ade4ed0..8c0cd0b694 100644 --- a/deps/grpc/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +++ b/deps/grpc/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc @@ -26,7 +26,6 @@ #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/host_port.h" namespace grpc_event_engine { diff --git a/deps/grpc/src/core/lib/event_engine/default_event_engine.cc b/deps/grpc/src/core/lib/event_engine/default_event_engine.cc index 743b788c72..45520f581e 100644 --- a/deps/grpc/src/core/lib/event_engine/default_event_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/default_event_engine.cc @@ -26,7 +26,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine_factory.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/sync.h" @@ -79,15 +78,15 @@ std::shared_ptr GetDefaultEventEngine( grpc_core::SourceLocation location) { grpc_core::MutexLock lock(&*g_mu); if (std::shared_ptr engine = g_event_engine->lock()) { - GRPC_EVENT_ENGINE_TRACE( - "Returning existing EventEngine::%p. use_count:%ld. Called from " - "[%s:%d]", - engine.get(), engine.use_count(), location.file(), location.line()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Returning existing EventEngine::" << engine.get() + << ". use_count:" << engine.use_count() << ". Called from " << location; return engine; } std::shared_ptr engine{CreateEventEngine()}; - GRPC_EVENT_ENGINE_TRACE("Created DefaultEventEngine::%p. Called from [%s:%d]", - engine.get(), location.file(), location.line()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Created DefaultEventEngine::" << engine.get() << ". Called from " + << location; *g_event_engine = engine; return engine; } diff --git a/deps/grpc/src/core/lib/event_engine/event_engine.cc b/deps/grpc/src/core/lib/event_engine/event_engine.cc index 74f24fdc9c..5a162f871a 100644 --- a/deps/grpc/src/core/lib/event_engine/event_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/event_engine.cc @@ -23,6 +23,13 @@ const EventEngine::TaskHandle EventEngine::TaskHandle::kInvalid = {-1, -1}; const EventEngine::ConnectionHandle EventEngine::ConnectionHandle::kInvalid = { -1, -1}; +namespace detail { +std::string FormatHandleString(uint64_t key1, uint64_t key2) { + return absl::StrCat("{", absl::Hex(key1, absl::kZeroPad16), ",", + absl::Hex(key2, absl::kZeroPad16), "}"); +} +} // namespace detail + namespace { template bool eq(const T& lhs, const T& rhs) { @@ -30,8 +37,7 @@ bool eq(const T& lhs, const T& rhs) { } template std::ostream& printout(std::ostream& out, const T& handle) { - out << absl::StrCat("{", absl::Hex(handle.keys[0], absl::kZeroPad16), ",", - absl::Hex(handle.keys[1], absl::kZeroPad16), "}"); + out << detail::FormatHandleString(handle.keys[0], handle.keys[1]); return out; } } // namespace diff --git a/deps/grpc/src/core/lib/event_engine/event_engine_context.h b/deps/grpc/src/core/lib/event_engine/event_engine_context.h index f14a6e8112..c49f8332b4 100644 --- a/deps/grpc/src/core/lib/event_engine/event_engine_context.h +++ b/deps/grpc/src/core/lib/event_engine/event_engine_context.h @@ -18,12 +18,14 @@ #include #include -#include "src/core/lib/promise/context.h" +#include "src/core/lib/resource_quota/arena.h" namespace grpc_core { template <> -struct ContextType {}; +struct ArenaContextType { + static void Destroy(grpc_event_engine::experimental::EventEngine*) {} +}; } // namespace grpc_core diff --git a/deps/grpc/src/core/lib/event_engine/forkable.cc b/deps/grpc/src/core/lib/event_engine/forkable.cc index c096ceb778..0034cbbd92 100644 --- a/deps/grpc/src/core/lib/event_engine/forkable.cc +++ b/deps/grpc/src/core/lib/event_engine/forkable.cc @@ -16,7 +16,6 @@ #include "absl/log/check.h" -#include #include #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK diff --git a/deps/grpc/src/core/lib/event_engine/forkable.h b/deps/grpc/src/core/lib/event_engine/forkable.h index cf8edac8e6..414947b751 100644 --- a/deps/grpc/src/core/lib/event_engine/forkable.h +++ b/deps/grpc/src/core/lib/event_engine/forkable.h @@ -17,7 +17,6 @@ #include #include -#include #include #include "src/core/lib/debug/trace.h" diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index c990fe4023..402822e27e 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -358,7 +358,7 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler) CHECK_GE(g_epoll_set_.epfd, 0); GRPC_TRACE_LOG(event_engine_poller, INFO) << "grpc epoll fd: " << g_epoll_set_.epfd; - struct epoll_event ev; + struct epoll_event ev {}; ev.events = static_cast(EPOLLIN | EPOLLET); ev.data.ptr = wakeup_fd_.get(); CHECK(epoll_ctl(g_epoll_set_.epfd, EPOLL_CTL_ADD, wakeup_fd_->ReadFd(), diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h index 0bd86a7296..ed6b480bde 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -102,17 +102,17 @@ class Epoll1Poller : public PosixEventPoller { friend class Epoll1EventHandle; #ifdef GRPC_LINUX_EPOLL struct EpollSet { - int epfd; + int epfd = -1; // The epoll_events after the last call to epoll_wait() - struct epoll_event events[MAX_EPOLL_EVENTS]; + struct epoll_event events[MAX_EPOLL_EVENTS]{}; // The number of epoll_events after the last call to epoll_wait() - int num_events; + int num_events = 0; // Index of the first event in epoll_events that has to be processed. This // field is only valid if num_events > 0 - int cursor; + int cursor = 0; }; #else struct EpollSet {}; diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index 3f383e663b..e573be3064 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/lockfree_event.cc index f95969bc69..dc7900646a 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/lockfree_event.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/lockfree_event.cc @@ -20,7 +20,6 @@ #include "absl/status/status.h" #include -#include #include #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index ffa34bc5f5..7634bb1334 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -39,11 +39,11 @@ #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/load_file.h" @@ -102,6 +102,7 @@ namespace { // of bytes sent. ssize_t TcpSend(int fd, const struct msghdr* msg, int* saved_errno, int additional_flags = 0) { + GRPC_LATENT_SEE_INNER_SCOPE("TcpSend"); ssize_t sent_length; do { sent_length = sendmsg(fd, msg, SENDMSG_FLAGS | additional_flags); @@ -286,6 +287,8 @@ absl::Status PosixEndpointImpl::TcpAnnotateError(absl::Status src_error) const { // Returns true if data available to read or error other than EAGAIN. bool PosixEndpointImpl::TcpDoRead(absl::Status& status) { + GRPC_LATENT_SEE_INNER_SCOPE("TcpDoRead"); + struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -345,7 +348,6 @@ bool PosixEndpointImpl::TcpDoRead(absl::Status& status) { // We have read something in previous reads. We need to deliver those bytes // to the upper layer. if (read_bytes <= 0 && total_read_bytes >= 1) { - inq_ = 1; break; } @@ -407,6 +409,12 @@ bool PosixEndpointImpl::TcpDoRead(absl::Status& status) { if (inq_ == 0) { FinishEstimate(); + // If this is using the epoll poller, then it is edge-triggered. + // Since this read did not consume the edge (i.e., did not get EAGAIN), the + // next read on this endpoint must assume there is something to read. + // Otherwise, assuming there is nothing to read and waiting for an epoll + // edge event could cause the next read to wait indefinitely. + inq_ = 1; } DCHECK_GT(total_read_bytes, 0u); @@ -564,7 +572,8 @@ void PosixEndpointImpl::HandleRead(absl::Status status) { grpc_core::MutexLock lock(&read_mu_); ret = HandleReadLocked(status); if (ret) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read complete", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read complete"; cb = std::move(read_cb_); read_cb_ = nullptr; incoming_buffer_ = nullptr; @@ -582,7 +591,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, SliceBuffer* buffer, const EventEngine::Endpoint::ReadArgs* args) { grpc_core::ReleasableMutexLock lock(&read_mu_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read"; CHECK(read_cb_ == nullptr); incoming_buffer_ = buffer; incoming_buffer_->Clear(); @@ -624,9 +634,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, // asynchronously. lock.Release(); engine_->Run([on_read = std::move(on_read), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "Endpoint[%p]: Read failed immediately: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read failed immediately: " << status; on_read(status); }); Unref(); @@ -636,8 +645,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, // callback. incoming_buffer_ = nullptr; Unref(); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read succeeded immediately", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read succeeded immediately"; return true; } return false; @@ -969,15 +978,15 @@ bool PosixEndpointImpl::DoFlushZerocopy(TcpZerocopySendRecord* record, handle_->SetWritable(); } else { #ifdef GRPC_LINUX_ERRQUEUE - GRPC_LOG_EVERY_N_SEC( - 1, GPR_INFO, - "Tx0cp encountered an ENOBUFS error possibly because one or " - "both of RLIMIT_MEMLOCK or hard memlock ulimit values are too " - "small for the intended user. Current system value of " - "RLIMIT_MEMLOCK is %" PRIu64 " and hard memlock ulimit is %" PRIu64 - ".Consider increasing these values appropriately for the intended " - "user.", - GetRLimitMemLockMax(), GetUlimitHardMemLock()); + LOG_EVERY_N_SEC(INFO, 1) + << "Tx0cp encountered an ENOBUFS error possibly because one or " + "both of RLIMIT_MEMLOCK or hard memlock ulimit values are too " + "small for the intended user. Current system value of " + "RLIMIT_MEMLOCK is " + << GetRLimitMemLockMax() << " and hard memlock ulimit is " + << GetUlimitHardMemLock() + << ".Consider increasing these values appropriately for the " + "intended user."; #endif } } @@ -1111,8 +1120,8 @@ bool PosixEndpointImpl::TcpFlush(absl::Status& status) { void PosixEndpointImpl::HandleWrite(absl::Status status) { if (!status.ok()) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; absl::AnyInvocable cb_ = std::move(write_cb_); write_cb_ = nullptr; if (current_zerocopy_send_ != nullptr) { @@ -1130,8 +1139,8 @@ void PosixEndpointImpl::HandleWrite(absl::Status status) { DCHECK(status.ok()); handle_->NotifyOnWrite(on_write_); } else { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write complete: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write complete: " << status; absl::AnyInvocable cb_ = std::move(write_cb_); write_cb_ = nullptr; current_zerocopy_send_ = nullptr; @@ -1150,8 +1159,8 @@ bool PosixEndpointImpl::Write( DCHECK_EQ(current_zerocopy_send_, nullptr); DCHECK_NE(data, nullptr); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write %" PRIdPTR " bytes", - this, data->Length()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write " << data->Length() << " bytes"; if (data->Length() == 0) { TcpShutdownTracedBufferList(); @@ -1159,13 +1168,14 @@ bool PosixEndpointImpl::Write( status = TcpAnnotateError(absl::InternalError("EOF")); engine_->Run( [on_writable = std::move(on_writable), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", - this, status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; on_writable(status); }); return false; } - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write skipped", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write skipped"; return true; } @@ -1197,16 +1207,16 @@ bool PosixEndpointImpl::Write( // asynchronously. engine_->Run( [on_writable = std::move(on_writable), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", - this, status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; on_writable(status); }); return false; } // Write succeeded immediately. Return true and don't run the on_writable // callback. - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write succeded immediately", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write succeded immediately"; return true; } diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.h index 0c42a5467c..80964556b0 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -38,7 +38,6 @@ #include #include #include -#include #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/posix.h" diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine.cc index ac73908323..7dfc253562 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -35,10 +35,8 @@ #include #include #include -#include #include -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/forkable.h" @@ -50,7 +48,6 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/no_destruct.h" @@ -95,15 +92,6 @@ class TimerForkCallbackMethods { static void PostforkChild() { g_timer_fork_manager->PostforkChild(); } }; -bool ShouldUseAresDnsResolver() { -#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) - auto resolver_env = grpc_core::ConfigVars::Get().DnsResolver(); - return resolver_env.empty() || absl::EqualsIgnoreCase(resolver_env, "ares"); -#else // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) - return false; -#endif // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) -} - } // namespace #ifdef GRPC_POSIX_SOCKET_TCP @@ -446,8 +434,8 @@ struct PosixEventEngine::ClosureData final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE("PosixEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "PosixEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->mu_); engine->known_handles_.erase(handle); @@ -462,11 +450,9 @@ PosixEventEngine::~PosixEventEngine() { grpc_core::MutexLock lock(&mu_); if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "(event_engine) PosixEventEngine:%p uncleared " - "TaskHandle at " - "shutdown:%s", - this, HandleToString(handle).c_str()); + LOG(ERROR) << "(event_engine) PosixEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } CHECK(GPR_LIKELY(known_handles_.empty())); @@ -523,8 +509,8 @@ EventEngine::TaskHandle PosixEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE("PosixEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "PosixEventEngine:" << this << " scheduling callback:" << handle; timer_manager_->TimerInit(&cd->timer, when_ts, cd); return handle; } diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index f81f57b528..fcc98fe4c8 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -40,12 +40,12 @@ #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_listener.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/gprpp/time.h" @@ -127,8 +127,8 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::Start() { void PosixEngineListenerImpl::AsyncConnectionAcceptor::NotifyOnAccept( absl::Status status) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Acceptor[%p]: NotifyOnAccept: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Acceptor[" << this << "]: NotifyOnAccept: " << status; if (!status.ok()) { // Shutting down the acceptor. Unref the ref grabbed in // AsyncConnectionAcceptor::Start(). diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 5a15129ddb..73a921a35e 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -93,7 +93,7 @@ class PosixEngineListenerImpl ResolvedAddressToNormalizedString(socket_.addr), listener_->poller_->CanTrackErrors())), notify_on_accept_(PosixEngineClosure::ToPermanentClosure( - [this](absl::Status status) { NotifyOnAccept(status); })){}; + [this](absl::Status status) { NotifyOnAccept(status); })) {}; // Start listening for incoming connections on the socket. void Start(); // Internal callback invoked when the socket has incoming connections to @@ -129,7 +129,7 @@ class PosixEngineListenerImpl class ListenerAsyncAcceptors : public ListenerSocketsContainer { public: explicit ListenerAsyncAcceptors(PosixEngineListenerImpl* listener) - : listener_(listener){}; + : listener_(listener) {}; void UpdateOnAppendCallback( PosixListenerWithFdSupport::OnPosixBindNewFdCallback on_append) { diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index fc87ffec61..ae193ff2be 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc @@ -106,14 +106,15 @@ int CreateSocket(std::function socket_factory, int family, : socket(family, type, protocol); if (res < 0 && errno == EMFILE) { int saved_errno = errno; - GRPC_LOG_EVERY_N_SEC( - 10, GPR_ERROR, - "socket(%d, %d, %d) returned %d with error: |%s|. This process " - "might not have a sufficient file descriptor limit for the number " - "of connections grpc wants to open (which is generally a function of " - "the number of grpc channels, the lb policy of each channel, and the " - "number of backends each channel is load balancing across).", - family, type, protocol, res, grpc_core::StrError(errno).c_str()); + LOG_EVERY_N_SEC(ERROR, 10) + << "socket(" << family << ", " << type << ", " << protocol + << ") returned " << res << " with error: |" + << grpc_core::StrError(errno) + << "|. This process might not have a sufficient file descriptor limit " + "for the number of connections grpc wants to open (which is " + "generally a function of the number of grpc channels, the lb policy " + "of each channel, and the number of backends each channel is load " + "balancing across)."; errno = saved_errno; } return res; @@ -148,15 +149,21 @@ absl::Status PrepareTcpClientSocket(PosixSocketWrapper sock, return absl::OkStatus(); } +#endif // GRPC_POSIX_SOCKET_UTILS_COMMON + +} // namespace + +#ifdef GRPC_POSIX_SOCKET_UTILS_COMMON +#ifndef GRPC_SET_SOCKET_DUALSTACK_CUSTOM + bool SetSocketDualStack(int fd) { const int off = 0; return 0 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); } +#endif // GRPC_SET_SOCKET_DUALSTACK_CUSTOM #endif // GRPC_POSIX_SOCKET_UTILS_COMMON -} // namespace - PosixTcpOptions TcpOptionsFromEndpointConfig(const EndpointConfig& config) { void* value; PosixTcpOptions options; diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h index 5bc53dbd39..412fafcad3 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -164,7 +163,7 @@ class PosixSocketWrapper { public: explicit PosixSocketWrapper(int fd) : fd_(fd) { CHECK_GT(fd_, 0); } - PosixSocketWrapper() : fd_(-1){}; + PosixSocketWrapper() : fd_(-1) {}; ~PosixSocketWrapper() = default; @@ -323,6 +322,8 @@ struct PosixSocketWrapper::PosixSocketCreateResult { EventEngine::ResolvedAddress mapped_target_addr; }; +bool SetSocketDualStack(int fd); + } // namespace experimental } // namespace grpc_event_engine diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/timer_manager.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/timer_manager.cc index 1c9f81f641..8a0373cf86 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/timer_manager.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/timer_manager.cc @@ -22,10 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/time/time.h" #include "absl/types/optional.h" -#include #include #include @@ -102,10 +102,9 @@ void TimerManager::TimerInit(Timer* timer, grpc_core::Timestamp deadline, if (GRPC_TRACE_FLAG_ENABLED(timer)) { grpc_core::MutexLock lock(&mu_); if (shutdown_) { - gpr_log(GPR_ERROR, - "WARNING: TimerManager::%p: scheduling Closure::%p after " - "TimerManager has been shut down.", - this, closure); + LOG(ERROR) << "WARNING: TimerManager::" << this + << ": scheduling Closure::" << closure + << " after TimerManager has been shut down."; } } timer_list_->TimerInit(timer, deadline, closure); @@ -119,17 +118,13 @@ void TimerManager::Shutdown() { { grpc_core::MutexLock lock(&mu_); if (shutdown_) return; - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p shutting down", this); - } + GRPC_TRACE_VLOG(timer, 2) << "TimerManager::" << this << " shutting down"; shutdown_ = true; // Wait on the main loop to exit. cv_wait_.Signal(); } main_loop_exit_signal_->WaitForNotification(); - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p shutdown complete", this); - } + GRPC_TRACE_VLOG(timer, 2) << "TimerManager::" << this << " shutdown complete"; } TimerManager::~TimerManager() { Shutdown(); } @@ -145,9 +140,8 @@ void TimerManager::Kick() { void TimerManager::RestartPostFork() { grpc_core::MutexLock lock(&mu_); CHECK(GPR_LIKELY(shutdown_)); - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p restarting after shutdown", this); - } + GRPC_TRACE_VLOG(timer, 2) + << "TimerManager::" << this << " restarting after shutdown"; shutdown_ = false; main_loop_exit_signal_.emplace(); thread_pool_->Run([this]() { MainLoop(); }); diff --git a/deps/grpc/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/deps/grpc/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc index 1171cb7662..d4cdfac8b7 100644 --- a/deps/grpc/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc +++ b/deps/grpc/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc @@ -24,7 +24,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/log.h" -#include #include #include diff --git a/deps/grpc/src/core/lib/event_engine/resolved_address.cc b/deps/grpc/src/core/lib/event_engine/resolved_address.cc index d6e01da006..95c37586ae 100644 --- a/deps/grpc/src/core/lib/event_engine/resolved_address.cc +++ b/deps/grpc/src/core/lib/event_engine/resolved_address.cc @@ -19,7 +19,6 @@ #include "absl/log/check.h" #include -#include #include #include "src/core/lib/event_engine/resolved_address_internal.h" diff --git a/deps/grpc/src/core/lib/event_engine/slice.cc b/deps/grpc/src/core/lib/event_engine/slice.cc index 51563f4a0c..7d4a6c4a05 100644 --- a/deps/grpc/src/core/lib/event_engine/slice.cc +++ b/deps/grpc/src/core/lib/event_engine/slice.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include "src/core/lib/slice/slice_internal.h" diff --git a/deps/grpc/src/core/lib/event_engine/thread_pool/thread_count.cc b/deps/grpc/src/core/lib/event_engine/thread_pool/thread_count.cc index 362fad18bb..6fc6a43c21 100644 --- a/deps/grpc/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/deps/grpc/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -17,12 +17,12 @@ #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" #include "absl/time/time.h" -#include #include #include "src/core/lib/gprpp/time.h" @@ -52,8 +52,8 @@ absl::Status LivingThreadCount::BlockUntilThreadCount( prev_thread_count = curr_threads; timeout_baseline = grpc_core::Timestamp::Now(); } - GRPC_LOG_EVERY_N_SEC_DELAYED( - log_rate.seconds(), GPR_DEBUG, + GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG( + log_rate.seconds(), "Waiting for thread pool to idle before %s. (%" PRIdPTR " to %" PRIdPTR "). Timing out in %0.f seconds.", why, curr_threads, desired_threads, diff --git a/deps/grpc/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/deps/grpc/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index 8f1653ea36..dcb0aabaf7 100644 --- a/deps/grpc/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/deps/grpc/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -36,10 +36,9 @@ #include #include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/debug/trace_impl.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_local.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" #include "src/core/lib/gprpp/crash.h" @@ -175,8 +174,8 @@ thread_local WorkQueue* g_local_queue = nullptr; WorkStealingThreadPool::WorkStealingThreadPool(size_t reserve_threads) : pool_{std::make_shared(reserve_threads)} { if (g_log_verbose_failures) { - GRPC_EVENT_ENGINE_TRACE( - "%s", "WorkStealingThreadPool verbose failures are enabled"); + GRPC_TRACE_LOG(event_engine, INFO) + << "WorkStealingThreadPool verbose failures are enabled"; } pool_->Start(); } @@ -318,7 +317,7 @@ bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::IsQuiesced() { } void WorkStealingThreadPool::WorkStealingThreadPoolImpl::PrepareFork() { - LOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(event_engine)) + GRPC_TRACE_LOG(event_engine, INFO) << "WorkStealingThreadPoolImpl::PrepareFork"; SetForking(true); work_signal_.SignalAll(); @@ -401,9 +400,7 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard:: if (pool_->IsQuiesced()) break; } else { lifeguard_should_shut_down_->WaitForNotificationWithTimeout( - absl::Milliseconds( - (backoff_.NextAttemptTime() - grpc_core::Timestamp::Now()) - .millis())); + absl::Milliseconds(backoff_.NextAttemptDelay().millis())); } MaybeStartNewThread(); } @@ -414,9 +411,9 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard:: WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard::~Lifeguard() { lifeguard_should_shut_down_->Notify(); while (lifeguard_running_.load(std::memory_order_relaxed)) { - GRPC_LOG_EVERY_N_SEC_DELAYED(kBlockingQuiesceLogRateSeconds, GPR_DEBUG, - "%s", - "Waiting for lifeguard thread to shut down"); + GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG( + kBlockingQuiesceLogRateSeconds, "%s", + "Waiting for lifeguard thread to shut down"); lifeguard_is_shut_down_->WaitForNotification(); } // Do an additional wait in case this method races with LifeguardMain's @@ -457,10 +454,9 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard:: // TODO(hork): new threads may spawn when there is no work in the global // queue, nor any work to steal. Add more sophisticated logic about when to // start a thread. - GRPC_EVENT_ENGINE_TRACE( - "Starting new ThreadPool thread due to backlog (total threads: %" PRIuPTR - ")", - living_thread_count + 1); + GRPC_TRACE_LOG(event_engine, INFO) + << "Starting new ThreadPool thread due to backlog (total threads: " + << living_thread_count + 1; pool_->StartThread(); // Tell the lifeguard to monitor the pool more closely. backoff_.Reset(); @@ -558,8 +554,8 @@ bool WorkStealingThreadPool::ThreadState::Step() { // No closures were retrieved from anywhere. // Quit the thread if the pool has been shut down. if (pool_->IsShutdown()) break; - bool timed_out = pool_->work_signal()->WaitWithTimeout( - backoff_.NextAttemptTime() - grpc_core::Timestamp::Now()); + bool timed_out = + pool_->work_signal()->WaitWithTimeout(backoff_.NextAttemptDelay()); if (pool_->IsForking() || pool_->IsShutdown()) break; // Quit a thread if the pool has more than it requires, and this thread // has been idle long enough. diff --git a/deps/grpc/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/deps/grpc/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc index f448108a39..3be7a0e0b3 100644 --- a/deps/grpc/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc @@ -22,6 +22,7 @@ #include #include "src/core/lib/gprpp/crash.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" namespace grpc_event_engine { @@ -39,20 +40,45 @@ ThreadyEventEngine::CreateListener( absl::AnyInvocable on_shutdown, const EndpointConfig& config, std::unique_ptr memory_allocator_factory) { + struct AcceptState { + grpc_core::Mutex mu_; + grpc_core::CondVar cv_; + int pending_accepts_ ABSL_GUARDED_BY(mu_) = 0; + }; + auto accept_state = std::make_shared(); return impl_->CreateListener( - [this, on_accept = std::make_shared( - std::move(on_accept))](std::unique_ptr endpoint, - MemoryAllocator memory_allocator) { + [this, accept_state, + on_accept = std::make_shared( + std::move(on_accept))](std::unique_ptr endpoint, + MemoryAllocator memory_allocator) { + { + grpc_core::MutexLock lock(&accept_state->mu_); + ++accept_state->pending_accepts_; + } Asynchronously( - [on_accept, endpoint = std::move(endpoint), + [on_accept, accept_state, endpoint = std::move(endpoint), memory_allocator = std::move(memory_allocator)]() mutable { (*on_accept)(std::move(endpoint), std::move(memory_allocator)); + { + grpc_core::MutexLock lock(&accept_state->mu_); + --accept_state->pending_accepts_; + if (accept_state->pending_accepts_ == 0) { + accept_state->cv_.Signal(); + } + } }); }, - [this, + [this, accept_state, on_shutdown = std::move(on_shutdown)](absl::Status status) mutable { - Asynchronously([on_shutdown = std::move(on_shutdown), + Asynchronously([accept_state, on_shutdown = std::move(on_shutdown), status = std::move(status)]() mutable { + while (true) { + grpc_core::MutexLock lock(&accept_state->mu_); + if (accept_state->pending_accepts_ == 0) { + break; + } + accept_state->cv_.Wait(&accept_state->mu_); + } on_shutdown(std::move(status)); }); }, diff --git a/deps/grpc/src/core/lib/event_engine/trace.h b/deps/grpc/src/core/lib/event_engine/trace.h deleted file mode 100644 index 5b91ffb949..0000000000 --- a/deps/grpc/src/core/lib/event_engine/trace.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2022 The gRPC Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H -#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H - -#include -#include - -#include "src/core/lib/debug/trace.h" - -#define GRPC_EVENT_ENGINE_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { \ - gpr_log(GPR_ERROR, "(event_engine) " format, __VA_ARGS__); \ - } - -#define GRPC_EVENT_ENGINE_ENDPOINT_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint)) { \ - gpr_log(GPR_ERROR, "(event_engine endpoint) " format, __VA_ARGS__); \ - } - -#define GRPC_EVENT_ENGINE_POLLER_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine_poller)) { \ - gpr_log(GPR_ERROR, "(event_engine poller) " format, __VA_ARGS__); \ - } - -#endif // GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H diff --git a/deps/grpc/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/deps/grpc/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc index 37a8f85cc5..b9542b0bb6 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -82,7 +82,7 @@ grpc_slice FlattenIovec(const struct iovec* iov, int iov_count) { // instantiated at the top of the virtual socket function callstack. class WSAErrorContext { public: - explicit WSAErrorContext(){}; + explicit WSAErrorContext() {}; ~WSAErrorContext() { if (error_ != 0) { @@ -128,9 +128,9 @@ class GrpcPolledFdWindows : public GrpcPolledFd { event_engine_(event_engine) {} ~GrpcPolledFdWindows() override { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| ~GrpcPolledFdWindows shutdown_called_: %d ", GetName(), - shutdown_called_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| ~GrpcPolledFdWindows shutdown_called_: " << shutdown_called_; grpc_core::CSliceUnref(read_buf_); grpc_core::CSliceUnref(write_buf_); CHECK(read_closure_ == nullptr); @@ -158,14 +158,16 @@ class GrpcPolledFdWindows : public GrpcPolledFd { void RegisterForOnWriteableLocked( absl::AnyInvocable write_closure) override { if (socket_type_ == SOCK_DGRAM) { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| RegisterForOnWriteableLocked called", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| RegisterForOnWriteableLocked called"; } else { CHECK(socket_type_ == SOCK_STREAM); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| RegisterForOnWriteableLocked called tcp_write_state_: %d " - "connect_done_: %d", - GetName(), tcp_write_state_, connect_done_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| RegisterForOnWriteableLocked called tcp_write_state_: " + << static_cast(tcp_write_state_) + << " connect_done_: " << connect_done_; } CHECK(write_closure_ == nullptr); write_closure_ = std::move(write_closure); @@ -184,7 +186,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd { if (!absl::IsCancelled(error)) { return false; } - GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| ShutdownLocked", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) << "(EventEngine c-ares resolver) fd:|" + << GetName() << "| ShutdownLocked"; shutdown_called_ = true; // The socket is disconnected and closed here since this is an external // cancel request, e.g. a timeout. c-ares shouldn't do anything on the @@ -203,10 +206,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { ares_ssize_t RecvFrom(WSAErrorContext* wsa_error_ctx, void* data, ares_socket_t data_len, int /* flags */, struct sockaddr* from, ares_socklen_t* from_len) { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| RecvFrom called read_buf_has_data:%d Current read buf " - "length:|%d|", - GetName(), read_buf_has_data_, GRPC_SLICE_LENGTH(read_buf_)); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " RecvFrom called read_buf_has_data:" << read_buf_has_data_ + << " Current read buf length:" << GRPC_SLICE_LENGTH(read_buf_); if (!read_buf_has_data_) { wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK); return -1; @@ -233,9 +236,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { ares_ssize_t SendV(WSAErrorContext* wsa_error_ctx, const struct iovec* iov, int iov_count) { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| SendV called connect_done_:%d wsa_connect_error_:%d", - GetName(), connect_done_, wsa_connect_error_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| SendV called connect_done_:" << connect_done_ + << " wsa_connect_error_:" << wsa_connect_error_; if (!connect_done_) { wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK); return -1; @@ -288,10 +292,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { } void ContinueRegisterForOnReadableLocked() { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| ContinueRegisterForOnReadableLocked " - "wsa_connect_error_:%d", - GetName(), wsa_connect_error_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| ContinueRegisterForOnReadableLocked wsa_connect_error_:" + << wsa_connect_error_; CHECK(connect_done_); if (wsa_connect_error_ != 0) { ScheduleAndNullReadClosure(GRPC_WSA_ERROR(wsa_connect_error_, "connect")); @@ -309,11 +313,11 @@ class GrpcPolledFdWindows : public GrpcPolledFd { winsocket_->read_info()->overlapped(), nullptr) != 0) { int wsa_last_error = WSAGetLastError(); char* msg = gpr_format_message(wsa_last_error); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| ContinueRegisterForOnReadableLocked WSARecvFrom error " - "code:|%d| " - "msg:|%s|", - GetName(), wsa_last_error, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " ContinueRegisterForOnReadableLocked WSARecvFrom error " + "code:" + << wsa_last_error << " msg:" << msg; gpr_free(msg); if (wsa_last_error != WSA_IO_PENDING) { winsocket_->UnregisterReadCallback(); @@ -325,10 +329,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { } void ContinueRegisterForOnWriteableLocked() { - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| ContinueRegisterForOnWriteableLocked " - "wsa_connect_error_:%d", - GetName(), wsa_connect_error_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| ContinueRegisterForOnWriteableLocked wsa_connect_error_:" + << wsa_connect_error_; CHECK(connect_done_); if (wsa_connect_error_ != 0) { ScheduleAndNullWriteClosure( @@ -372,12 +376,12 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int out = WSASend(winsocket_->raw_socket(), &buf, 1, bytes_sent_ptr, flags, overlapped, nullptr); *wsa_error_code = WSAGetLastError(); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| SendWriteBuf WSASend buf.len:%d *bytes_sent_ptr:%d " - "overlapped:%p " - "return:%d *wsa_error_code:%d", - GetName(), buf.len, bytes_sent_ptr != nullptr ? *bytes_sent_ptr : 0, - overlapped, out, *wsa_error_code); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " SendWriteBuf WSASend buf.len:" << buf.len << " *bytes_sent_ptr:" + << (bytes_sent_ptr != nullptr ? *bytes_sent_ptr : 0) + << " overlapped:" << overlapped << " return:" << out + << " *wsa_error_code:" << *wsa_error_code; return out; } @@ -386,7 +390,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd { // c-ares doesn't handle retryable errors on writes of UDP sockets. // Therefore, the sendv handler for UDP sockets must only attempt // to write everything inline. - GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| SendVUDP called", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) << "(EventEngine c-ares resolver) fd:|" + << GetName() << "| SendVUDP called"; CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0); grpc_core::CSliceUnref(write_buf_); write_buf_ = FlattenIovec(iov, iov_count); @@ -397,9 +402,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { write_buf_ = grpc_empty_slice(); wsa_error_ctx->SetWSAError(wsa_error_code); char* msg = gpr_format_message(wsa_error_code); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| SendVUDP SendWriteBuf error code:%d msg:|%s|", GetName(), - wsa_error_code, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| SendVUDP SendWriteBuf error code:" << wsa_error_code << " msg:|" + << msg << "|"; gpr_free(msg); return -1; } @@ -415,8 +421,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { // out in the background, and making further send progress in general, will // happen as long as c-ares continues to show interest in writeability on // this fd. - GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| SendVTCP called tcp_write_state_:%d", - GetName(), tcp_write_state_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| SendVTCP called tcp_write_state_:" + << static_cast(tcp_write_state_); switch (tcp_write_state_) { case WRITE_IDLE: tcp_write_state_ = WRITE_REQUESTED; @@ -453,12 +461,12 @@ class GrpcPolledFdWindows : public GrpcPolledFd { void OnTcpConnect() { grpc_core::MutexLock lock(mu_); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:%s InnerOnTcpConnectLocked " - "pending_register_for_readable:%d" - " pending_register_for_writeable:%d", - GetName(), pending_continue_register_for_on_readable_locked_, - pending_continue_register_for_on_writeable_locked_); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " InnerOnTcpConnectLocked pending_register_for_readable:" + << pending_continue_register_for_on_readable_locked_ + << " pending_register_for_writeable:" + << pending_continue_register_for_on_writeable_locked_; CHECK(!connect_done_); connect_done_ = true; CHECK_EQ(wsa_connect_error_, 0); @@ -474,10 +482,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { if (!wsa_success) { wsa_connect_error_ = WSAGetLastError(); char* msg = gpr_format_message(wsa_connect_error_); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:%s InnerOnTcpConnectLocked WSA overlapped result code:%d " - "msg:|%s|", - GetName(), wsa_connect_error_, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " InnerOnTcpConnectLocked WSA overlapped result code:" + << wsa_connect_error_ << " msg:|" << msg << "|"; gpr_free(msg); } } @@ -491,7 +499,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int ConnectUDP(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target, ares_socklen_t target_len) { - GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectUDP", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() << " ConnectUDP"; CHECK(!connect_done_); CHECK_EQ(wsa_connect_error_, 0); SOCKET s = winsocket_->raw_socket(); @@ -501,8 +510,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { wsa_error_ctx->SetWSAError(wsa_connect_error_); connect_done_ = true; char* msg = gpr_format_message(wsa_connect_error_); - GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s WSAConnect error code:|%d| msg:|%s|", - GetName(), wsa_connect_error_, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " WSAConnect error code:|" << wsa_connect_error_ << "| msg:|" << msg + << "|"; gpr_free(msg); // c-ares expects a posix-style connect API return out == 0 ? 0 : -1; @@ -510,7 +521,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int ConnectTCP(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target, ares_socklen_t target_len) { - GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectTCP", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() << " ConnectTCP"; LPFN_CONNECTEX ConnectEx; GUID guid = WSAID_CONNECTEX; DWORD ioctl_num_bytes; @@ -521,10 +533,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int wsa_last_error = WSAGetLastError(); wsa_error_ctx->SetWSAError(wsa_last_error); char* msg = gpr_format_message(wsa_last_error); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:%s WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER) error code:%d " - "msg:|%s|", - GetName(), wsa_last_error, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER) error code:" + << wsa_last_error << " msg:|" << msg << "|"; gpr_free(msg); connect_done_ = true; wsa_connect_error_ = wsa_last_error; @@ -544,8 +556,9 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int wsa_last_error = WSAGetLastError(); wsa_error_ctx->SetWSAError(wsa_last_error); char* msg = gpr_format_message(wsa_last_error); - GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s bind error code:%d msg:|%s|", - GetName(), wsa_last_error, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " bind error code:" << wsa_last_error << " msg:|" << msg << "|"; gpr_free(msg); connect_done_ = true; wsa_connect_error_ = wsa_last_error; @@ -561,8 +574,10 @@ class GrpcPolledFdWindows : public GrpcPolledFd { int wsa_last_error = WSAGetLastError(); wsa_error_ctx->SetWSAError(wsa_last_error); char* msg = gpr_format_message(wsa_last_error); - GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectEx error code:%d msg:|%s|", - GetName(), wsa_last_error, msg); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << GetName() + << " ConnectEx error code:" << wsa_last_error << " msg:|" << msg + << "|"; gpr_free(msg); if (wsa_last_error == WSA_IO_PENDING) { // c-ares only understands WSAEINPROGRESS and EWOULDBLOCK error codes on @@ -597,11 +612,12 @@ class GrpcPolledFdWindows : public GrpcPolledFd { if (winsocket_->read_info()->result().wsa_error != WSAEMSGSIZE) { error = GRPC_WSA_ERROR(winsocket_->read_info()->result().wsa_error, "OnIocpReadableInner"); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| OnIocpReadableInner winsocket_->read_info.wsa_error " - "code:|%d| msg:|%s|", - GetName(), winsocket_->read_info()->result().wsa_error, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| OnIocpReadableInner winsocket_->read_info.wsa_error " + "code:|" + << winsocket_->read_info()->result().wsa_error << "| msg:|" + << grpc_core::StatusToString(error) << "|"; } } if (error.ok()) { @@ -612,34 +628,40 @@ class GrpcPolledFdWindows : public GrpcPolledFd { grpc_core::CSliceUnref(read_buf_); read_buf_ = grpc_empty_slice(); } - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| OnIocpReadable finishing. read buf length now:|%d|", GetName(), - GRPC_SLICE_LENGTH(read_buf_)); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| OnIocpReadable finishing. read buf length now:|" + << GRPC_SLICE_LENGTH(read_buf_) << "|"; ScheduleAndNullReadClosure(error); } void OnIocpWriteable() { grpc_core::MutexLock lock(mu_); - GRPC_ARES_RESOLVER_TRACE_LOG("OnIocpWriteableInner. fd:|%s|", GetName()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) OnIocpWriteableInner. fd:|" + << GetName() << "|"; CHECK(socket_type_ == SOCK_STREAM); absl::Status error; if (winsocket_->write_info()->result().wsa_error != 0) { error = GRPC_WSA_ERROR(winsocket_->write_info()->result().wsa_error, "OnIocpWriteableInner"); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| OnIocpWriteableInner. winsocket_->write_info.wsa_error " - "code:|%d| msg:|%s|", - GetName(), winsocket_->write_info()->result().wsa_error, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| OnIocpWriteableInner. winsocket_->write_info.wsa_error " + "code:|" + << winsocket_->write_info()->result().wsa_error << "| msg:|" + << grpc_core::StatusToString(error) << "|"; } CHECK(tcp_write_state_ == WRITE_PENDING); if (error.ok()) { tcp_write_state_ = WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY; write_buf_ = grpc_slice_sub_no_ref( write_buf_, 0, winsocket_->write_info()->result().bytes_transferred); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| OnIocpWriteableInner. bytes transferred:%d", GetName(), - winsocket_->write_info()->result().bytes_transferred); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:|" << GetName() + << "| OnIocpWriteableInner. bytes transferred:" + << winsocket_->write_info()->result().bytes_transferred; + } else { grpc_core::CSliceUnref(write_buf_); write_buf_ = grpc_empty_slice(); @@ -686,8 +708,10 @@ class CustomSockFuncs { public: static ares_socket_t Socket(int af, int type, int protocol, void* user_data) { if (type != SOCK_DGRAM && type != SOCK_STREAM) { - GRPC_ARES_RESOLVER_TRACE_LOG("Socket called with invalid socket type:%d", - type); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) Socket called with invalid socket " + "type:" + << type; return INVALID_SOCKET; } GrpcPolledFdFactoryWindows* self = @@ -695,24 +719,26 @@ class CustomSockFuncs { SOCKET s = WSASocket(af, type, protocol, nullptr, 0, IOCP::GetDefaultSocketFlags()); if (s == INVALID_SOCKET) { - GRPC_ARES_RESOLVER_TRACE_LOG( - "WSASocket failed with params af:%d type:%d protocol:%d", af, type, - protocol); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) WSASocket failed with params af:" + << af << " type:" << type << " protocol:" << protocol; return INVALID_SOCKET; } if (type == SOCK_STREAM) { absl::Status error = PrepareSocket(s); if (!error.ok()) { - GRPC_ARES_RESOLVER_TRACE_LOG("WSAIoctl failed with error: %s", - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) WSAIoctl failed with error: " + << grpc_core::StatusToString(error); return INVALID_SOCKET; } } auto polled_fd = std::make_unique( self->iocp_->Watch(s), self->mu_, af, type, self->event_engine_); - GRPC_ARES_RESOLVER_TRACE_LOG( - "fd:|%s| created with params af:%d type:%d protocol:%d", - polled_fd->GetName(), af, type, protocol); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) fd:" << polled_fd->GetName() + << " created with params af:" << af << " type:" << type + << " protocol:" << protocol; CHECK(self->sockets_.insert({s, std::move(polled_fd)}).second); return s; } @@ -750,7 +776,9 @@ class CustomSockFuncs { } static int CloseSocket(SOCKET s, void*) { - GRPC_ARES_RESOLVER_TRACE_LOG("c-ares socket: %d CloseSocket", s); + GRPC_TRACE_LOG(cares_resolver, INFO) + << "(EventEngine c-ares resolver) c-ares socket: " << s + << " CloseSocket"; return 0; } }; diff --git a/deps/grpc/src/core/lib/event_engine/windows/iocp.cc b/deps/grpc/src/core/lib/event_engine/windows/iocp.cc index c3b9a37e87..b81ec3dc50 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/iocp.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/iocp.cc @@ -25,7 +25,6 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/gprpp/crash.h" @@ -60,9 +59,9 @@ std::unique_ptr IOCP::Watch(SOCKET socket) { } void IOCP::Shutdown() { - GRPC_EVENT_ENGINE_POLLER_TRACE( - "IOCP::%p shutting down. Outstanding kicks: %d", this, - outstanding_kicks_.load()); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this + << " shutting down. Outstanding kicks: " << outstanding_kicks_.load(); while (outstanding_kicks_.load() > 0) { Work(std::chrono::hours(42), []() {}); } @@ -74,18 +73,20 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout, DWORD bytes = 0; ULONG_PTR completion_key; LPOVERLAPPED overlapped; - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p doing work", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " doing work"; BOOL success = GetQueuedCompletionStatus( iocp_handle_, &bytes, &completion_key, &overlapped, static_cast(Milliseconds(timeout))); if (success == 0 && overlapped == nullptr) { - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p deadline exceeded", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " deadline exceeded"; return Poller::WorkResult::kDeadlineExceeded; } CHECK(completion_key); CHECK(overlapped); if (overlapped == &kick_overlap_) { - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p kicked", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) << "IOCP::" << this << " kicked"; outstanding_kicks_.fetch_sub(1); if (completion_key == (ULONG_PTR)&kick_token_) { return Poller::WorkResult::kKicked; @@ -93,8 +94,8 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout, grpc_core::Crash( absl::StrFormat("Unknown custom completion key: %lu", completion_key)); } - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p got event on OVERLAPPED::%p", this, - overlapped); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " got event on OVERLAPPED::" << overlapped; // Safety note: socket is guaranteed to exist when managed by a // WindowsEndpoint. If an overlapped event came in, then either a read event // handler is registered, which keeps the socket alive, or the WindowsEndpoint diff --git a/deps/grpc/src/core/lib/event_engine/windows/win_socket.cc b/deps/grpc/src/core/lib/event_engine/windows/win_socket.cc index 4771465adf..8c18b09ae4 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/win_socket.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/win_socket.cc @@ -22,7 +22,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -49,7 +48,8 @@ WinSocket::WinSocket(SOCKET socket, ThreadPool* thread_pool) noexcept WinSocket::~WinSocket() { CHECK(is_shutdown_.load()); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p destroyed", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " destroyed"; } SOCKET WinSocket::raw_socket() { return socket_; } @@ -57,8 +57,8 @@ SOCKET WinSocket::raw_socket() { return socket_; } void WinSocket::Shutdown() { // if already shutdown, return early. Otherwise, set the shutdown flag. if (is_shutdown_.exchange(true)) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p already shutting down", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " already shutting down"; return; } // Grab the function pointer for DisconnectEx for that specific socket. @@ -86,14 +86,15 @@ void WinSocket::Shutdown() { } } closesocket(socket_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p socket closed", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " socket closed"; } void WinSocket::Shutdown(const grpc_core::DebugLocation& location, absl::string_view reason) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "WinSocket::%p Shut down from %s:%d. Reason: %s", this, location.file(), - location.line(), reason.data()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " Shut down from " << location.file() << ":" + << location.line() << ". Reason: " << reason.data(); Shutdown(); } @@ -172,10 +173,11 @@ void WinSocket::OpState::GetOverlappedResult(SOCKET sock) { bool WinSocket::IsShutdown() { return is_shutdown_.load(); } WinSocket::OpState* WinSocket::GetOpInfoForOverlapped(OVERLAPPED* overlapped) { - GRPC_EVENT_ENGINE_POLLER_TRACE( - "WinSocket::%p looking for matching OVERLAPPED::%p. " - "read(%p) write(%p)", - this, overlapped, &read_info_.overlapped_, &write_info_.overlapped_); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "WinSocket::" << this + << " looking for matching OVERLAPPED::" << overlapped << ". read(" + << &read_info_.overlapped_ << ") write(" << &write_info_.overlapped_ + << ")"; if (overlapped == &read_info_.overlapped_) return &read_info_; if (overlapped == &write_info_.overlapped_) return &write_info_; return nullptr; diff --git a/deps/grpc/src/core/lib/event_engine/windows/windows_endpoint.cc b/deps/grpc/src/core/lib/event_engine/windows/windows_endpoint.cc index 065f812aa4..d3bda779dd 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -18,6 +18,7 @@ #include "absl/cleanup/cleanup.h" #include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" @@ -26,7 +27,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/status_helper.h" @@ -74,11 +74,12 @@ WindowsEndpoint::WindowsEndpoint( WindowsEndpoint::~WindowsEndpoint() { io_state_->socket->Shutdown(DEBUG_LOCATION, "~WindowsEndpoint"); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("~WindowsEndpoint::%p", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) << "~WindowsEndpoint::" << this; } void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p reading", endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << endpoint << " reading"; if (socket->IsShutdown()) { socket->read_info()->SetErrorStatus( absl::InternalError("Socket is shutting down.")); @@ -148,7 +149,8 @@ bool WindowsEndpoint::Read(absl::AnyInvocable on_read, bool WindowsEndpoint::Write(absl::AnyInvocable on_writable, SliceBuffer* data, const WriteArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p writing", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << this << " writing"; if (io_state_->socket->IsShutdown()) { io_state_->thread_pool->Run( [on_writable = std::move(on_writable)]() mutable { @@ -279,8 +281,8 @@ void WindowsEndpoint::HandleReadClosure::Run() { // Deletes the shared_ptr when this closure returns // Note that the endpoint may have already been destroyed. auto io_state = std::move(io_state_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p Handling Read Event", - io_state->endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << io_state->endpoint << " Handling Read Event"; const auto result = io_state->socket->read_info()->result(); if (!result.error_status.ok()) { buffer_->Clear(); @@ -340,8 +342,8 @@ void WindowsEndpoint::HandleReadClosure::DonateSpareSlices( void WindowsEndpoint::HandleWriteClosure::Run() { // Deletes the shared_ptr when this closure returns auto io_state = std::move(io_state_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p Handling Write Event", - io_state->endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << io_state->endpoint << " Handling Write Event"; const auto result = io_state->socket->write_info()->result(); if (!result.error_status.ok()) { buffer_->Clear(); diff --git a/deps/grpc/src/core/lib/event_engine/windows/windows_engine.cc b/deps/grpc/src/core/lib/event_engine/windows/windows_engine.cc index 7d683d5269..c691859bdf 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/windows_engine.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/windows_engine.cc @@ -36,7 +36,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" #include "src/core/lib/event_engine/windows/iocp.h" @@ -190,9 +189,8 @@ struct WindowsEventEngine::TimerClosure final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->task_mu_); engine->known_handles_.erase(handle); @@ -214,16 +212,15 @@ WindowsEventEngine::WindowsEventEngine() } WindowsEventEngine::~WindowsEventEngine() { - GRPC_EVENT_ENGINE_TRACE("~WindowsEventEngine::%p", this); + GRPC_TRACE_LOG(event_engine, INFO) << "~WindowsEventEngine::" << this; { task_mu_.Lock(); if (!known_handles_.empty()) { if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "WindowsEventEngine:%p uncleared TaskHandle at shutdown:%s", - this, - HandleToString(handle).c_str()); + LOG(ERROR) << "WindowsEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } // Allow a small grace period for timers to be run before shutting down. @@ -231,8 +228,8 @@ WindowsEventEngine::~WindowsEventEngine() { timer_manager_.Now() + grpc_core::Duration::FromSecondsAsDouble(10); while (!known_handles_.empty() && timer_manager_.Now() < deadline) { if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { - GRPC_LOG_EVERY_N_SEC(1, GPR_DEBUG, "Waiting for timers. %d remaining", - known_handles_.size()); + VLOG_EVERY_N_SEC(2, 1) << "Waiting for timers. " + << known_handles_.size() << " remaining"; } task_mu_.Unlock(); absl::SleepFor(absl::Milliseconds(200)); @@ -253,9 +250,8 @@ WindowsEventEngine::~WindowsEventEngine() { bool WindowsEventEngine::Cancel(EventEngine::TaskHandle handle) { grpc_core::MutexLock lock(&task_mu_); if (!known_handles_.contains(handle)) return false; - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine::%p cancelling %s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine::" << this << " cancelling " << handle; auto* cd = reinterpret_cast(handle.keys[0]); bool r = timer_manager_.TimerCancel(&cd->timer); known_handles_.erase(handle); @@ -292,9 +288,8 @@ EventEngine::TaskHandle WindowsEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&task_mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine:" << this << " scheduling callback:" << handle; timer_manager_.TimerInit(&cd->timer, when_ts, cd); return handle; } @@ -326,21 +321,24 @@ void WindowsEventEngine::WindowsDNSResolver::LookupTXT( absl::StatusOr> WindowsEventEngine::GetDNSResolver( EventEngine::DNSResolver::ResolverOptions const& options) { + if (ShouldUseAresDnsResolver()) { #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) - auto ares_resolver = AresResolver::CreateAresResolver( - options.dns_server, - std::make_unique(poller()), - shared_from_this()); - if (!ares_resolver.ok()) { - return ares_resolver.status(); + GRPC_TRACE_LOG(event_engine_dns, INFO) + << "WindowsEventEngine::" << this << " creating AresResolver"; + auto ares_resolver = AresResolver::CreateAresResolver( + options.dns_server, + std::make_unique(poller()), + shared_from_this()); + if (!ares_resolver.ok()) { + return ares_resolver.status(); + } + return std::make_unique( + std::move(*ares_resolver)); +#endif // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) } - return std::make_unique( - std::move(*ares_resolver)); -#else // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) GRPC_TRACE_LOG(event_engine_dns, INFO) << "WindowsEventEngine::" << this << " creating NativeWindowsDNSResolver"; return std::make_unique(shared_from_this()); -#endif // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) } bool WindowsEventEngine::IsWorkerThread() { grpc_core::Crash("unimplemented"); } @@ -360,8 +358,8 @@ void WindowsEventEngine::OnConnectCompleted( known_connection_handles_.erase(state->connection_handle()); } if (erased_handles != 1 || !Cancel(state->timer_handle())) { - GRPC_EVENT_ENGINE_TRACE( - "%s", "Not accepting connection since the deadline timer has fired"); + GRPC_TRACE_LOG(event_engine, INFO) + << "Not accepting connection since the deadline timer has fired"; return; } // Release refs held by the deadline timer. @@ -413,8 +411,8 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect( }); return EventEngine::ConnectionHandle::kInvalid; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::%p connecting to %s", this, - uri->c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::" << this << " connecting to " << *uri; // Use dualstack sockets where available. ResolvedAddress address = addr; ResolvedAddress addr6_v4mapped; @@ -540,17 +538,16 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect( bool WindowsEventEngine::CancelConnect(EventEngine::ConnectionHandle handle) { if (handle == EventEngine::ConnectionHandle::kInvalid) { - GRPC_EVENT_ENGINE_TRACE("%s", - "Attempted to cancel an invalid connection handle"); + GRPC_TRACE_LOG(event_engine, INFO) + << "Attempted to cancel an invalid connection handle"; return false; } // Erase the connection handle, which may be unknown { grpc_core::MutexLock lock(&connection_mu_); if (known_connection_handles_.erase(handle) != 1) { - GRPC_EVENT_ENGINE_TRACE( - "Unknown connection handle: %s", - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Unknown connection handle: " << handle; return false; } } @@ -581,10 +578,8 @@ bool WindowsEventEngine::CancelConnectInternalStateLocked( ConnectionState* connection_state) { connection_state->socket()->Shutdown(DEBUG_LOCATION, "CancelConnect"); // Release the connection_state shared_ptr owned by the connected callback. - GRPC_EVENT_ENGINE_TRACE("Successfully cancelled connection %s", - HandleToString( - connection_state->connection_handle()) - .c_str()); + GRPC_TRACE_LOG(event_engine, INFO) << "Successfully cancelled connection " + << connection_state->connection_handle(); return true; } diff --git a/deps/grpc/src/core/lib/event_engine/windows/windows_listener.cc b/deps/grpc/src/core/lib/event_engine/windows/windows_listener.cc index 5a682fbcc8..c04346fb9b 100644 --- a/deps/grpc/src/core/lib/event_engine/windows/windows_listener.cc +++ b/deps/grpc/src/core/lib/event_engine/windows/windows_listener.cc @@ -21,7 +21,6 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" @@ -52,10 +51,9 @@ void WindowsEventEngineListener::SinglePortSocketListener:: CHECK_NE(io_state_, nullptr); grpc_core::ReleasableMutexLock lock(&io_state_->mu); if (io_state_->listener_socket->IsShutdown()) { - GRPC_EVENT_ENGINE_TRACE( - "SinglePortSocketListener::%p listener socket is shut down. Shutting " - "down listener.", - io_state_->port_listener); + GRPC_TRACE_LOG(event_engine, INFO) + << "SinglePortSocketListener::" << io_state_->port_listener + << " listener socket is shut down. Shutting down listener."; lock.Release(); io_state_.reset(); return; @@ -103,7 +101,7 @@ WindowsEventEngineListener::SinglePortSocketListener:: io_state_->listener_socket->Shutdown(DEBUG_LOCATION, "~SinglePortSocketListener"); UnlinkIfUnixDomainSocket(listener_sockname()); - GRPC_EVENT_ENGINE_TRACE("~SinglePortSocketListener::%p", this); + GRPC_TRACE_LOG(event_engine, INFO) << "~SinglePortSocketListener::" << this; } absl::StatusOr< @@ -179,9 +177,9 @@ WindowsEventEngineListener::SinglePortSocketListener::StartLocked() { } } io_state_->accept_socket = accept_socket; - GRPC_EVENT_ENGINE_TRACE( - "SinglePortSocketListener::%p listening. listener_socket::%p", this, - io_state_->listener_socket.get()); + GRPC_TRACE_LOG(event_engine, INFO) + << "SinglePortSocketListener::" << this + << " listening. listener_socket::" << io_state_->listener_socket.get(); return absl::OkStatus(); } @@ -311,8 +309,7 @@ WindowsEventEngineListener::WindowsEventEngineListener( on_shutdown_(std::move(on_shutdown)) {} WindowsEventEngineListener::~WindowsEventEngineListener() { - GRPC_EVENT_ENGINE_TRACE( - "%s", absl::StrFormat("~WindowsEventEngineListener::%p", this).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) << "~WindowsEventEngineListener::" << this; ShutdownListeners(); on_shutdown_(absl::OkStatus()); } diff --git a/deps/grpc/src/core/lib/experiments/config.cc b/deps/grpc/src/core/lib/experiments/config.cc index 00859a0ce0..5248321879 100644 --- a/deps/grpc/src/core/lib/experiments/config.cc +++ b/deps/grpc/src/core/lib/experiments/config.cc @@ -30,7 +30,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include #include #include "src/core/lib/config/config_vars.h" @@ -138,8 +137,7 @@ GPR_ATTRIBUTE_NOINLINE Experiments LoadExperimentsFromConfigVariableInner() { // If not found log an error, but don't take any other action. // Allows us an easy path to disabling experiments. if (!found) { - gpr_log(GPR_ERROR, "Unknown experiment: %s", - std::string(experiment).c_str()); + LOG(ERROR) << "Unknown experiment: " << experiment; } } for (size_t i = 0; i < kNumExperiments; i++) { @@ -172,6 +170,7 @@ Experiments& ExperimentsSingleton() { } // namespace void TestOnlyReloadExperimentsFromConfigVariables() { + ExperimentFlags::TestOnlyClear(); ExperimentsSingleton() = LoadExperimentsFromConfigVariable(); PrintExperimentsList(); } @@ -182,8 +181,35 @@ void LoadTestOnlyExperimentsFromMetadata( new TestExperiments(experiment_metadata, num_experiments); } -bool IsExperimentEnabled(size_t experiment_id) { - return ExperimentsSingleton().enabled[experiment_id]; +std::atomic + ExperimentFlags::experiment_flags_[kNumExperimentFlagsWords]; + +bool ExperimentFlags::LoadFlagsAndCheck(size_t experiment_id) { + static_assert(kNumExperiments < kNumExperimentFlagsWords * kFlagsPerWord, + "kNumExperiments must be less than " + "kNumExperimentFlagsWords*kFlagsPerWord; if this fails then " + "make kNumExperimentFlagsWords bigger."); + const auto& experiments = ExperimentsSingleton(); + uint64_t building[kNumExperimentFlagsWords]; + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + building[i] = kLoadedFlag; + } + for (size_t i = 0; i < kNumExperiments; i++) { + if (!experiments.enabled[i]) continue; + auto bit = i % kFlagsPerWord; + auto word = i / kFlagsPerWord; + building[word] |= 1ull << bit; + } + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + experiment_flags_[i].store(building[i], std::memory_order_relaxed); + } + return experiments.enabled[experiment_id]; +} + +void ExperimentFlags::TestOnlyClear() { + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + experiment_flags_[i].store(0, std::memory_order_relaxed); + } } bool IsExperimentEnabledInConfiguration(size_t experiment_id) { @@ -194,6 +220,8 @@ bool IsTestExperimentEnabled(size_t experiment_id) { return (*g_test_experiments)[experiment_id]; } +#define GRPC_EXPERIMENT_LOG VLOG(2) + void PrintExperimentsList() { std::map experiment_status; std::set defaulted_on_experiments; @@ -228,20 +256,20 @@ void PrintExperimentsList() { } if (experiment_status.empty()) { if (!defaulted_on_experiments.empty()) { - VLOG(2) << "gRPC experiments enabled: " - << absl::StrJoin(defaulted_on_experiments, ", "); + GRPC_EXPERIMENT_LOG << "gRPC experiments enabled: " + << absl::StrJoin(defaulted_on_experiments, ", "); } } else { if (defaulted_on_experiments.empty()) { - VLOG(2) << "gRPC experiments: " - << absl::StrJoin(experiment_status, ", ", - absl::PairFormatter(":")); + GRPC_EXPERIMENT_LOG << "gRPC experiments: " + << absl::StrJoin(experiment_status, ", ", + absl::PairFormatter(":")); } else { - VLOG(2) << "gRPC experiments: " - << absl::StrJoin(experiment_status, ", ", - absl::PairFormatter(":")) - << "; default-enabled: " - << absl::StrJoin(defaulted_on_experiments, ", "); + GRPC_EXPERIMENT_LOG << "gRPC experiments: " + << absl::StrJoin(experiment_status, ", ", + absl::PairFormatter(":")) + << "; default-enabled: " + << absl::StrJoin(defaulted_on_experiments, ", "); } } } @@ -258,8 +286,8 @@ void ForceEnableExperiment(absl::string_view experiment, bool enable) { } return; } - gpr_log(GPR_INFO, "gRPC EXPERIMENT %s not found to force %s", - std::string(experiment).c_str(), enable ? "enable" : "disable"); + LOG(INFO) << "gRPC EXPERIMENT " << experiment << " not found to force " + << (enable ? "enable" : "disable"); } void RegisterExperimentConstraintsValidator( diff --git a/deps/grpc/src/core/lib/experiments/config.h b/deps/grpc/src/core/lib/experiments/config.h index 2c601001bf..921875b99b 100644 --- a/deps/grpc/src/core/lib/experiments/config.h +++ b/deps/grpc/src/core/lib/experiments/config.h @@ -18,6 +18,8 @@ #include #include +#include + #include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" @@ -38,16 +40,68 @@ struct ExperimentMetadata { }; #ifndef GRPC_EXPERIMENTS_ARE_FINAL +class ExperimentFlags { + public: + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsExperimentEnabled( + size_t experiment_id) { + auto bit = experiment_id % kFlagsPerWord; + auto word = experiment_id / kFlagsPerWord; + auto cur = experiment_flags_[word].load(std::memory_order_relaxed); + if (cur & (1ull << bit)) return true; + if (cur & kLoadedFlag) return false; + return LoadFlagsAndCheck(experiment_id); + } + + template + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsExperimentEnabled() { + auto bit = kExperimentId % kFlagsPerWord; + auto word = kExperimentId / kFlagsPerWord; + auto cur = experiment_flags_[word].load(std::memory_order_relaxed); + if (cur & (1ull << bit)) return true; + if (cur & kLoadedFlag) return false; + return LoadFlagsAndCheck(kExperimentId); + } + + static void TestOnlyClear(); + + private: + static bool LoadFlagsAndCheck(size_t experiment_id); + + // We layout experiment flags in groups of 63... each 64 bit word contains + // 63 enablement flags (one per experiment), and the high bit which indicates + // whether the flags have been loaded from the configuration. + // Consequently, with one load, we can tell if the experiment is definitely + // enabled (the bit is set), or definitely disabled (the bit is clear, and the + // loaded flag is set), or if we need to load the flags and re-check. + + static constexpr size_t kNumExperimentFlagsWords = 8; + static constexpr size_t kFlagsPerWord = 63; + static constexpr uint64_t kLoadedFlag = 0x8000000000000000ull; + static std::atomic experiment_flags_[kNumExperimentFlagsWords]; +}; + // Return true if experiment \a experiment_id is enabled. // Experiments are numbered by their order in the g_experiment_metadata array // declared in experiments.h. -bool IsExperimentEnabled(size_t experiment_id); +inline bool IsExperimentEnabled(size_t experiment_id) { + return ExperimentFlags::IsExperimentEnabled(experiment_id); +} + +template +inline bool IsExperimentEnabled() { + return ExperimentFlags::IsExperimentEnabled(); +} // Given a test experiment id, returns true if the test experiment is enabled. // Test experiments can be loaded using the LoadTestOnlyExperimentsFromMetadata // method. bool IsTestExperimentEnabled(size_t experiment_id); +template +inline bool IsTestExperimentEnabled() { + return IsTestExperimentEnabled(kExperimentId); +} + // Slow check for if a named experiment is enabled. // Parses the configuration and looks up the experiment in that, so it does not // affect any global state, but it does require parsing the configuration every diff --git a/deps/grpc/src/core/lib/experiments/experiments.cc b/deps/grpc/src/core/lib/experiments/experiments.cc index bb9a76d340..96a2c73430 100644 --- a/deps/grpc/src/core/lib/experiments/experiments.cc +++ b/deps/grpc/src/core/lib/experiments/experiments.cc @@ -22,16 +22,19 @@ #if defined(GRPC_CFSTREAM) namespace { -const char* const description_call_status_override_on_cancellation = - "Avoid overriding call status of successfully finished calls if it races " - "with cancellation."; -const char* const additional_constraints_call_status_override_on_cancellation = - "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_event_engine_application_callbacks = + "Run application callbacks in EventEngine threads, instead of on the " + "thread-local ApplicationCallbackExecCtx"; +const char* const additional_constraints_event_engine_application_callbacks = + "{}"; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; @@ -44,17 +47,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -66,21 +58,12 @@ const char* const additional_constraints_monitoring_experiment = "{}"; const char* const description_multiping = "Allow more than one ping to be in flight at a time by default."; const char* const additional_constraints_multiping = "{}"; -const char* const description_peer_state_based_framing = - "If set, the max sizes of frames sent to lower layers is controlled based " - "on the peer's memory pressure which is reflected in its max http2 frame " - "size."; -const char* const additional_constraints_peer_state_based_framing = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; -const char* const description_rstpit = - "On RST_STREAM on a server, reduce MAX_CONCURRENT_STREAMS for a short " - "duration"; -const char* const additional_constraints_rstpit = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -96,6 +79,10 @@ const char* const additional_constraints_tcp_frame_size_tuning = "{}"; const char* const description_tcp_rcv_lowat = "Use SO_RCVLOWAT to avoid wakeups on the read path."; const char* const additional_constraints_tcp_rcv_lowat = "{}"; +const char* const description_time_caching_in_party = + "Disable time caching in exec_ctx, and enable it only in a single party " + "execution."; +const char* const additional_constraints_time_caching_in_party = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; @@ -117,14 +104,16 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { - {"call_status_override_on_cancellation", - description_call_status_override_on_cancellation, - additional_constraints_call_status_override_on_cancellation, nullptr, 0, - true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"event_engine_application_callbacks", + description_event_engine_application_callbacks, + additional_constraints_event_engine_application_callbacks, nullptr, 0, + true, true}, {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, false, true}, {"event_engine_dns", description_event_engine_dns, @@ -133,12 +122,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, false, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -146,16 +129,12 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_monitoring_experiment, nullptr, 0, true, true}, {"multiping", description_multiping, additional_constraints_multiping, nullptr, 0, false, true}, - {"peer_state_based_framing", description_peer_state_based_framing, - additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, - {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0, - false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -166,6 +145,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true}, {"tcp_rcv_lowat", description_tcp_rcv_lowat, additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, + {"time_caching_in_party", description_time_caching_in_party, + additional_constraints_time_caching_in_party, nullptr, 0, true, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", @@ -184,16 +165,19 @@ const ExperimentMetadata g_experiment_metadata[] = { #elif defined(GPR_WINDOWS) namespace { -const char* const description_call_status_override_on_cancellation = - "Avoid overriding call status of successfully finished calls if it races " - "with cancellation."; -const char* const additional_constraints_call_status_override_on_cancellation = - "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_event_engine_application_callbacks = + "Run application callbacks in EventEngine threads, instead of on the " + "thread-local ApplicationCallbackExecCtx"; +const char* const additional_constraints_event_engine_application_callbacks = + "{}"; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; @@ -206,17 +190,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -228,21 +201,12 @@ const char* const additional_constraints_monitoring_experiment = "{}"; const char* const description_multiping = "Allow more than one ping to be in flight at a time by default."; const char* const additional_constraints_multiping = "{}"; -const char* const description_peer_state_based_framing = - "If set, the max sizes of frames sent to lower layers is controlled based " - "on the peer's memory pressure which is reflected in its max http2 frame " - "size."; -const char* const additional_constraints_peer_state_based_framing = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; -const char* const description_rstpit = - "On RST_STREAM on a server, reduce MAX_CONCURRENT_STREAMS for a short " - "duration"; -const char* const additional_constraints_rstpit = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -258,6 +222,10 @@ const char* const additional_constraints_tcp_frame_size_tuning = "{}"; const char* const description_tcp_rcv_lowat = "Use SO_RCVLOWAT to avoid wakeups on the read path."; const char* const additional_constraints_tcp_rcv_lowat = "{}"; +const char* const description_time_caching_in_party = + "Disable time caching in exec_ctx, and enable it only in a single party " + "execution."; +const char* const additional_constraints_time_caching_in_party = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; @@ -279,14 +247,16 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { - {"call_status_override_on_cancellation", - description_call_status_override_on_cancellation, - additional_constraints_call_status_override_on_cancellation, nullptr, 0, - true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"event_engine_application_callbacks", + description_event_engine_application_callbacks, + additional_constraints_event_engine_application_callbacks, nullptr, 0, + true, true}, {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, true, true}, {"event_engine_dns", description_event_engine_dns, @@ -295,12 +265,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -308,16 +272,12 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_monitoring_experiment, nullptr, 0, true, true}, {"multiping", description_multiping, additional_constraints_multiping, nullptr, 0, false, true}, - {"peer_state_based_framing", description_peer_state_based_framing, - additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, - {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0, - false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -328,6 +288,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true}, {"tcp_rcv_lowat", description_tcp_rcv_lowat, additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, + {"time_caching_in_party", description_time_caching_in_party, + additional_constraints_time_caching_in_party, nullptr, 0, true, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", @@ -346,16 +308,19 @@ const ExperimentMetadata g_experiment_metadata[] = { #else namespace { -const char* const description_call_status_override_on_cancellation = - "Avoid overriding call status of successfully finished calls if it races " - "with cancellation."; -const char* const additional_constraints_call_status_override_on_cancellation = - "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_event_engine_application_callbacks = + "Run application callbacks in EventEngine threads, instead of on the " + "thread-local ApplicationCallbackExecCtx"; +const char* const additional_constraints_event_engine_application_callbacks = + "{}"; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; @@ -368,17 +333,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -390,21 +344,12 @@ const char* const additional_constraints_monitoring_experiment = "{}"; const char* const description_multiping = "Allow more than one ping to be in flight at a time by default."; const char* const additional_constraints_multiping = "{}"; -const char* const description_peer_state_based_framing = - "If set, the max sizes of frames sent to lower layers is controlled based " - "on the peer's memory pressure which is reflected in its max http2 frame " - "size."; -const char* const additional_constraints_peer_state_based_framing = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; -const char* const description_rstpit = - "On RST_STREAM on a server, reduce MAX_CONCURRENT_STREAMS for a short " - "duration"; -const char* const additional_constraints_rstpit = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -420,6 +365,10 @@ const char* const additional_constraints_tcp_frame_size_tuning = "{}"; const char* const description_tcp_rcv_lowat = "Use SO_RCVLOWAT to avoid wakeups on the read path."; const char* const additional_constraints_tcp_rcv_lowat = "{}"; +const char* const description_time_caching_in_party = + "Disable time caching in exec_ctx, and enable it only in a single party " + "execution."; +const char* const additional_constraints_time_caching_in_party = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; @@ -441,14 +390,16 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { - {"call_status_override_on_cancellation", - description_call_status_override_on_cancellation, - additional_constraints_call_status_override_on_cancellation, nullptr, 0, - true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"event_engine_application_callbacks", + description_event_engine_application_callbacks, + additional_constraints_event_engine_application_callbacks, nullptr, 0, + true, true}, {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, false, true}, {"event_engine_dns", description_event_engine_dns, @@ -457,12 +408,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -470,16 +415,12 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_monitoring_experiment, nullptr, 0, true, true}, {"multiping", description_multiping, additional_constraints_multiping, nullptr, 0, false, true}, - {"peer_state_based_framing", description_peer_state_based_framing, - additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, - {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0, - false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -490,6 +431,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true}, {"tcp_rcv_lowat", description_tcp_rcv_lowat, additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, + {"time_caching_in_party", description_time_caching_in_party, + additional_constraints_time_caching_in_party, nullptr, 0, true, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", diff --git a/deps/grpc/src/core/lib/experiments/experiments.h b/deps/grpc/src/core/lib/experiments/experiments.h index 5bfdf2f71c..b6fb4257c5 100644 --- a/deps/grpc/src/core/lib/experiments/experiments.h +++ b/deps/grpc/src/core/lib/experiments/experiments.h @@ -57,31 +57,29 @@ namespace grpc_core { #ifdef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS +inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } -inline bool IsPeerStateBasedFramingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } -inline bool IsRstpitEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY +inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } @@ -90,10 +88,12 @@ inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } inline bool IsWorkSerializerDispatchEnabled() { return false; } #elif defined(GPR_WINDOWS) -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS +inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS @@ -101,23 +101,19 @@ inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } -inline bool IsPeerStateBasedFramingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } -inline bool IsRstpitEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY +inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } @@ -126,33 +122,31 @@ inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } inline bool IsWorkSerializerDispatchEnabled() { return false; } #else -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS +inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } inline bool IsEventEngineClientEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } -inline bool IsPeerStateBasedFramingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } -inline bool IsRstpitEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY +inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } @@ -163,132 +157,117 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; } #else enum ExperimentIds { - kExperimentIdCallStatusOverrideOnCancellation, + kExperimentIdCallTracerInTransport, kExperimentIdCanaryClientPrivacy, kExperimentIdClientPrivacy, + kExperimentIdEventEngineApplicationCallbacks, kExperimentIdEventEngineClient, kExperimentIdEventEngineDns, kExperimentIdEventEngineListener, kExperimentIdFreeLargeAllocator, - kExperimentIdHttp2StatsFix, - kExperimentIdKeepaliveFix, - kExperimentIdKeepaliveServerFix, kExperimentIdMaxPingsWoDataThrottle, kExperimentIdMonitoringExperiment, kExperimentIdMultiping, - kExperimentIdPeerStateBasedFraming, kExperimentIdPickFirstNew, kExperimentIdPromiseBasedInprocTransport, - kExperimentIdRstpit, kExperimentIdScheduleCancellationOverWrite, kExperimentIdServerPrivacy, kExperimentIdTcpFrameSizeTuning, kExperimentIdTcpRcvLowat, + kExperimentIdTimeCachingInParty, kExperimentIdTraceRecordCallops, kExperimentIdUnconstrainedMaxQuotaBufferSize, kExperimentIdWorkSerializerClearsTimeCache, kExperimentIdWorkSerializerDispatch, kNumExperiments }; -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -inline bool IsCallStatusOverrideOnCancellationEnabled() { - return IsExperimentEnabled(kExperimentIdCallStatusOverrideOnCancellation); +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_CANARY_CLIENT_PRIVACY inline bool IsCanaryClientPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY inline bool IsClientPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdClientPrivacy); + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS +inline bool IsEventEngineApplicationCallbacksEnabled() { + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineClient); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineDns); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineListener); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR inline bool IsFreeLargeAllocatorEnabled() { - return IsExperimentEnabled(kExperimentIdFreeLargeAllocator); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { - return IsExperimentEnabled(kExperimentIdHttp2StatsFix); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_FIX -inline bool IsKeepaliveFixEnabled() { - return IsExperimentEnabled(kExperimentIdKeepaliveFix); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_SERVER_FIX -inline bool IsKeepaliveServerFixEnabled() { - return IsExperimentEnabled(kExperimentIdKeepaliveServerFix); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE inline bool IsMaxPingsWoDataThrottleEnabled() { - return IsExperimentEnabled(kExperimentIdMaxPingsWoDataThrottle); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { - return IsExperimentEnabled(kExperimentIdMonitoringExperiment); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MULTIPING inline bool IsMultipingEnabled() { - return IsExperimentEnabled(kExperimentIdMultiping); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING -inline bool IsPeerStateBasedFramingEnabled() { - return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { - return IsExperimentEnabled(kExperimentIdPickFirstNew); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_INPROC_TRANSPORT inline bool IsPromiseBasedInprocTransportEnabled() { - return IsExperimentEnabled(kExperimentIdPromiseBasedInprocTransport); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_RSTPIT -inline bool IsRstpitEnabled() { - return IsExperimentEnabled(kExperimentIdRstpit); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE inline bool IsScheduleCancellationOverWriteEnabled() { - return IsExperimentEnabled(kExperimentIdScheduleCancellationOverWrite); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_PRIVACY inline bool IsServerPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdServerPrivacy); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING inline bool IsTcpFrameSizeTuningEnabled() { - return IsExperimentEnabled(kExperimentIdTcpFrameSizeTuning); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_RCV_LOWAT inline bool IsTcpRcvLowatEnabled() { - return IsExperimentEnabled(kExperimentIdTcpRcvLowat); + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY +inline bool IsTimeCachingInPartyEnabled() { + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { - return IsExperimentEnabled(kExperimentIdTraceRecordCallops); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { - return IsExperimentEnabled(kExperimentIdUnconstrainedMaxQuotaBufferSize); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { - return IsExperimentEnabled(kExperimentIdWorkSerializerClearsTimeCache); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { - return IsExperimentEnabled(kExperimentIdWorkSerializerDispatch); + return IsExperimentEnabled(); } extern const ExperimentMetadata g_experiment_metadata[kNumExperiments]; diff --git a/deps/grpc/src/core/lib/experiments/experiments.yaml b/deps/grpc/src/core/lib/experiments/experiments.yaml index c0ca8edc96..6cc3781f26 100644 --- a/deps/grpc/src/core/lib/experiments/experiments.yaml +++ b/deps/grpc/src/core/lib/experiments/experiments.yaml @@ -40,74 +40,54 @@ # This file only defines the experiments. Refer to rollouts.yaml for the rollout # state of each experiment. -- name: call_status_override_on_cancellation - description: - Avoid overriding call status of successfully finished calls if it races with - cancellation. - expiry: 2024/08/01 - owner: vigneshbabu@google.com +- name: call_tracer_in_transport + description: Transport directly passes byte counts to CallTracer. + expiry: 2024/09/30 + owner: roth@google.com test_tags: [] - name: canary_client_privacy description: If set, canary client privacy - expiry: 2024/08/01 + expiry: 2024/12/01 owner: alishananda@google.com test_tags: [] allow_in_fuzzing_config: false - name: client_privacy description: If set, client privacy - expiry: 2024/08/01 + expiry: 2024/12/01 owner: alishananda@google.com test_tags: [] allow_in_fuzzing_config: false +- name: event_engine_application_callbacks + description: Run application callbacks in EventEngine threads, instead of on the thread-local ApplicationCallbackExecCtx + expiry: 2024/10/31 + owner: hork@google.com - name: event_engine_client description: Use EventEngine clients instead of iomgr's grpc_tcp_client - expiry: 2024/07/01 + expiry: 2024/10/01 owner: hork@google.com test_tags: ["core_end2end_test", "event_engine_client_test"] uses_polling: true - name: event_engine_dns description: If set, use EventEngine DNSResolver for client channel resolution - expiry: 2024/07/01 + expiry: 2024/10/01 owner: yijiem@google.com test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"] allow_in_fuzzing_config: false uses_polling: true - name: event_engine_listener description: Use EventEngine listeners instead of iomgr's grpc_tcp_server - expiry: 2024/07/01 + expiry: 2024/12/01 owner: vigneshbabu@google.com test_tags: ["core_end2end_test", "event_engine_listener_test"] uses_polling: true - name: free_large_allocator description: If set, return all free bytes from a "big" allocator - expiry: 2024/08/01 + expiry: 2024/12/01 owner: alishananda@google.com test_tags: [resource_quota_test] -- name: http2_stats_fix - description: - Fix on HTTP2 outgoing data stats reporting - expiry: 2024/09/30 - owner: yashkt@google.com - test_tags: [] -- name: keepalive_fix - description: - Allows overriding keepalive_permit_without_calls. - Refer https://github.com/grpc/grpc/pull/33428 for more information. - expiry: 2024/06/30 - owner: yashkt@google.com - test_tags: [] - allow_in_fuzzing_config: false -- name: keepalive_server_fix - description: - Allows overriding keepalive_permit_without_calls for servers. - Refer https://github.com/grpc/grpc/pull/33917 for more information. - expiry: 2024/12/31 - owner: yashkt@google.com - test_tags: [] - allow_in_fuzzing_config: false - name: max_pings_wo_data_throttle description: Experiment to throttle pings to a period of 1 min when @@ -127,17 +107,9 @@ expiry: 2024/09/15 owner: ctiller@google.com test_tags: [flow_control_test] -- name: peer_state_based_framing - description: - If set, the max sizes of frames sent to lower layers is controlled based - on the peer's memory pressure which is reflected in its max http2 frame - size. - expiry: 2024/08/01 - owner: vigneshbabu@google.com - test_tags: ["flow_control_test"] - name: pick_first_new description: New pick_first impl with memory reduction. - expiry: 2024/07/30 + expiry: 2024/10/30 owner: roth@google.com test_tags: ["lb_unit_test", "cpp_lb_end2end_test", "xds_end2end_test"] - name: promise_based_inproc_transport @@ -147,21 +119,15 @@ owner: ctiller@google.com test_tags: [] allow_in_fuzzing_config: false # experiment currently crashes if enabled -- name: rstpit - description: - On RST_STREAM on a server, reduce MAX_CONCURRENT_STREAMS for a short duration - expiry: 2024/08/03 - owner: ctiller@google.com - test_tags: [flow_control_test] - name: schedule_cancellation_over_write description: Allow cancellation op to be scheduled over a write - expiry: 2024/08/01 + expiry: 2024/12/01 owner: vigneshbabu@google.com test_tags: [] - name: server_privacy description: If set, server privacy - expiry: 2024/08/01 + expiry: 2024/12/01 owner: alishananda@google.com test_tags: [] allow_in_fuzzing_config: false @@ -171,28 +137,33 @@ TCP would not indicate completion of a read operation until a specified number of bytes have been read over the socket. Buffers are also allocated according to estimated RPC sizes. - expiry: 2024/08/01 + expiry: 2024/12/01 owner: vigneshbabu@google.com test_tags: ["endpoint_test", "flow_control_test"] - name: tcp_rcv_lowat description: Use SO_RCVLOWAT to avoid wakeups on the read path. - expiry: 2024/08/01 + expiry: 2024/12/01 owner: vigneshbabu@google.com test_tags: ["endpoint_test", "flow_control_test"] +- name: time_caching_in_party + description: Disable time caching in exec_ctx, and enable it only in a single party execution. + owner: ctiller@google.com + expiry: 2024/12/12 + test_tags: [] - name: trace_record_callops description: Enables tracing of call batch initiation and completion. - expiry: 2024/08/01 + expiry: 2024/12/01 owner: vigneshbabu@google.com test_tags: [] - name: unconstrained_max_quota_buffer_size description: Discard the cap on the max free pool size for one memory allocator - expiry: 2024/09/01 + expiry: 2024/09/09 owner: ctiller@google.com test_tags: [resource_quota_test] - name: work_serializer_clears_time_cache description: Have the work serializer clear the time cache when it dispatches work. - expiry: 2024/07/01 + expiry: 2024/10/01 owner: ctiller@google.com test_tags: [] - name: work_serializer_dispatch @@ -200,6 +171,6 @@ Have the work serializer dispatch work to event engine for every callback, instead of running things inline in the first thread that successfully enqueues work. - expiry: 2024/06/30 + expiry: 2024/09/30 owner: ysseung@google.com test_tags: ["core_end2end_test", "cpp_end2end_test", "xds_end2end_test", "lb_unit_test"] diff --git a/deps/grpc/src/core/lib/experiments/rollouts.yaml b/deps/grpc/src/core/lib/experiments/rollouts.yaml index befe2e74ea..661539b102 100644 --- a/deps/grpc/src/core/lib/experiments/rollouts.yaml +++ b/deps/grpc/src/core/lib/experiments/rollouts.yaml @@ -40,7 +40,7 @@ # # Supported platforms: ios, windows, posix -- name: call_status_override_on_cancellation +- name: call_tracer_in_transport default: true - name: call_v3 default: false @@ -53,6 +53,8 @@ windows: broken - name: client_privacy default: false +- name: event_engine_application_callbacks + default: true - name: event_engine_client default: # not tested on iOS at all @@ -73,18 +75,10 @@ windows: true - name: free_large_allocator default: false -- name: http2_stats_fix - default: true -- name: keepalive_fix - default: false -- name: keepalive_server_fix - default: false - name: max_pings_wo_data_throttle default: false - name: monitoring_experiment default: true -- name: peer_state_based_framing - default: false - name: pending_queue_cap default: true - name: pick_first_new @@ -104,6 +98,8 @@ default: false - name: tcp_rcv_lowat default: false +- name: time_caching_in_party + default: true - name: trace_record_callops default: true - name: unconstrained_max_quota_buffer_size diff --git a/deps/grpc/src/core/lib/gprpp/bitset.h b/deps/grpc/src/core/lib/gprpp/bitset.h index ea941b0e10..c224bd257d 100644 --- a/deps/grpc/src/core/lib/gprpp/bitset.h +++ b/deps/grpc/src/core/lib/gprpp/bitset.h @@ -138,7 +138,7 @@ class BitSet { uint32_t count() const { uint32_t count = 0; for (size_t i = 0; i < kUnits; i++) { - count += BitCount(units_[i]); + count += absl::popcount(units_[i]); } return count; } diff --git a/deps/grpc/src/core/lib/gprpp/chunked_vector.h b/deps/grpc/src/core/lib/gprpp/chunked_vector.h index b60bdac65a..a90f455d46 100644 --- a/deps/grpc/src/core/lib/gprpp/chunked_vector.h +++ b/deps/grpc/src/core/lib/gprpp/chunked_vector.h @@ -21,7 +21,6 @@ #include "absl/log/check.h" -#include #include #include "src/core/lib/gprpp/manual_constructor.h" diff --git a/deps/grpc/src/core/lib/gprpp/construct_destruct.h b/deps/grpc/src/core/lib/gprpp/construct_destruct.h index d905c26d35..62e4df4bc5 100644 --- a/deps/grpc/src/core/lib/gprpp/construct_destruct.h +++ b/deps/grpc/src/core/lib/gprpp/construct_destruct.h @@ -24,14 +24,14 @@ namespace grpc_core { // Call the destructor of p without having to name the type of p. template -void Destruct(T* p) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Destruct(T* p) { p->~T(); } // Call the constructor of p without having to name the type of p and forward // any arguments template -void Construct(T* p, Args&&... args) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Construct(T* p, Args&&... args) { new (p) T(std::forward(args)...); } diff --git a/deps/grpc/src/core/lib/gprpp/debug_location.h b/deps/grpc/src/core/lib/gprpp/debug_location.h index 2637d316d1..89a948da7f 100644 --- a/deps/grpc/src/core/lib/gprpp/debug_location.h +++ b/deps/grpc/src/core/lib/gprpp/debug_location.h @@ -21,6 +21,8 @@ #include +#include "absl/strings/str_cat.h" + #include #if defined(__has_builtin) @@ -56,6 +58,11 @@ class SourceLocation { int line_; }; +template +void AbslStringify(Sink& out, const SourceLocation& location) { + out.Append(absl::StrCat("[", location.file(), ":", location.line(), "]")); +} + // Used for tracking file and line where a call is made for debug builds. // No-op for non-debug builds. // Callers can use the DEBUG_LOCATION macro in either case. diff --git a/deps/grpc/src/core/lib/gprpp/down_cast.h b/deps/grpc/src/core/lib/gprpp/down_cast.h index ca1b2d7802..e7c05bf4b7 100644 --- a/deps/grpc/src/core/lib/gprpp/down_cast.h +++ b/deps/grpc/src/core/lib/gprpp/down_cast.h @@ -20,13 +20,12 @@ #include "absl/base/config.h" #include "absl/log/check.h" -#include #include namespace grpc_core { template -inline To DownCast(From* f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From* f) { static_assert( std::is_base_of::type>::value, "DownCast requires a base-to-derived relationship"); @@ -40,7 +39,7 @@ inline To DownCast(From* f) { } template -inline To DownCast(From& f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From& f) { return *DownCast::type*>(&f); } diff --git a/deps/grpc/src/core/lib/gprpp/dump_args.cc b/deps/grpc/src/core/lib/gprpp/dump_args.cc index d4400bbf29..1e2972f6dd 100644 --- a/deps/grpc/src/core/lib/gprpp/dump_args.cc +++ b/deps/grpc/src/core/lib/gprpp/dump_args.cc @@ -21,7 +21,7 @@ namespace grpc_core { namespace dump_args_detail { -std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { +void DumpArgs::Stringify(CustomSink& sink) const { // Parse the argument string into a vector of keys. // #__VA_ARGS__ produces a stringified version of the arguments passed to the // macro. It's comma separated, and we can use that to split the string into @@ -29,8 +29,8 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { // we need to skip commas that are inside parenthesis. std::vector keys; int depth = 0; - const char* start = args.arg_string_; - for (const char* p = args.arg_string_; *p; ++p) { + const char* start = arg_string_; + for (const char* p = arg_string_; *p; ++p) { if (*p == '(') { ++depth; } else if (*p == ')') { @@ -41,13 +41,13 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { } } keys.push_back(start); - CHECK_EQ(keys.size(), args.arg_dumpers_.size()); + CHECK_EQ(keys.size(), arg_dumpers_.size()); for (size_t i = 0; i < keys.size(); i++) { - if (i != 0) out << ", "; - out << absl::StripAsciiWhitespace(keys[i]) << " = "; - args.arg_dumpers_[i](out); + if (i != 0) sink.Append(", "); + sink.Append(absl::StripAsciiWhitespace(keys[i])); + sink.Append(" = "); + arg_dumpers_[i](sink); } - return out; } } // namespace dump_args_detail diff --git a/deps/grpc/src/core/lib/gprpp/dump_args.h b/deps/grpc/src/core/lib/gprpp/dump_args.h index abd5b6a202..1e89fa48c6 100644 --- a/deps/grpc/src/core/lib/gprpp/dump_args.h +++ b/deps/grpc/src/core/lib/gprpp/dump_args.h @@ -19,6 +19,9 @@ #include #include "absl/functional/any_invocable.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" namespace grpc_core { namespace dump_args_detail { @@ -39,17 +42,62 @@ class DumpArgs { do_these_things({AddDumper(&args)...}); } - friend std::ostream& operator<<(std::ostream& out, const DumpArgs& args); + template + friend void AbslStringify(Sink& sink, const DumpArgs& dumper) { + CustomSinkImpl custom_sink(sink); + dumper.Stringify(custom_sink); + } + + friend std::ostream& operator<<(std::ostream& out, const DumpArgs& dumper) { + return out << absl::StrCat(dumper); + } private: + class CustomSink { + public: + virtual void Append(absl::string_view x) = 0; + + protected: + ~CustomSink() = default; + }; + + template + class CustomSinkImpl final : public CustomSink { + public: + explicit CustomSinkImpl(Sink& sink) : sink_(sink) {} + void Append(absl::string_view x) override { sink_.Append(x); } + + private: + Sink& sink_; + }; + template int AddDumper(T* p) { - arg_dumpers_.push_back([p](std::ostream& os) { os << *p; }); + arg_dumpers_.push_back( + [p](CustomSink& os) { os.Append(absl::StrCat(*p)); }); return 0; } + int AddDumper(void** p) { + arg_dumpers_.push_back( + [p](CustomSink& os) { os.Append(absl::StrFormat("%p", *p)); }); + return 0; + } + + template + int AddDumper(T** p) { + return AddDumper(reinterpret_cast(p)); + } + + template + int AddDumper(T* const* p) { + return AddDumper(const_cast(p)); + } + + void Stringify(CustomSink& sink) const; + const char* arg_string_; - std::vector> arg_dumpers_; + std::vector> arg_dumpers_; }; } // namespace dump_args_detail diff --git a/deps/grpc/src/core/lib/gprpp/host_port.cc b/deps/grpc/src/core/lib/gprpp/host_port.cc index 7e5ae646ca..fec4315110 100644 --- a/deps/grpc/src/core/lib/gprpp/host_port.cc +++ b/deps/grpc/src/core/lib/gprpp/host_port.cc @@ -24,7 +24,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/lib/gprpp/load_file.cc b/deps/grpc/src/core/lib/gprpp/load_file.cc index 01cb7798de..dd15004570 100644 --- a/deps/grpc/src/core/lib/gprpp/load_file.cc +++ b/deps/grpc/src/core/lib/gprpp/load_file.cc @@ -24,7 +24,6 @@ #include #include -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/lib/gprpp/mpscq.h b/deps/grpc/src/core/lib/gprpp/mpscq.h index c33d34ffa1..f6306d4682 100644 --- a/deps/grpc/src/core/lib/gprpp/mpscq.h +++ b/deps/grpc/src/core/lib/gprpp/mpscq.h @@ -23,7 +23,6 @@ #include "absl/log/check.h" -#include #include #include "src/core/lib/gprpp/sync.h" diff --git a/deps/grpc/src/core/lib/gprpp/single_set_ptr.h b/deps/grpc/src/core/lib/gprpp/single_set_ptr.h index a8e1f278ba..016967b5f4 100644 --- a/deps/grpc/src/core/lib/gprpp/single_set_ptr.h +++ b/deps/grpc/src/core/lib/gprpp/single_set_ptr.h @@ -20,7 +20,6 @@ #include "absl/log/check.h" -#include #include namespace grpc_core { diff --git a/deps/grpc/src/core/lib/gprpp/status_helper.cc b/deps/grpc/src/core/lib/gprpp/status_helper.cc index 40db6dc0cf..b3563592b5 100644 --- a/deps/grpc/src/core/lib/gprpp/status_helper.cc +++ b/deps/grpc/src/core/lib/gprpp/status_helper.cc @@ -35,7 +35,6 @@ #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" -#include #include #include "src/core/lib/slice/percent_encoding.h" @@ -342,7 +341,7 @@ google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) { PercentEncodingType::Compatible); char* message_percent = reinterpret_cast( upb_Arena_Malloc(arena, message_percent_slice.length())); - if (message_percent_slice.length() > 0) { + if (!message_percent_slice.empty()) { memcpy(message_percent, message_percent_slice.data(), message_percent_slice.length()); } diff --git a/deps/grpc/src/core/lib/gprpp/sync.h b/deps/grpc/src/core/lib/gprpp/sync.h index 16efe619cd..3b80a7bc91 100644 --- a/deps/grpc/src/core/lib/gprpp/sync.h +++ b/deps/grpc/src/core/lib/gprpp/sync.h @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/synchronization/mutex.h" -#include #include #include diff --git a/deps/grpc/src/core/lib/gprpp/table.h b/deps/grpc/src/core/lib/gprpp/table.h index 8c6bc97854..7085bae035 100644 --- a/deps/grpc/src/core/lib/gprpp/table.h +++ b/deps/grpc/src/core/lib/gprpp/table.h @@ -35,20 +35,28 @@ namespace grpc_core { namespace table_detail { // A tuple-like type that contains manually constructed elements. -template +template struct Elements; template -struct Elements : Elements { - union U { - U() {} - ~U() {} - GPR_NO_UNIQUE_ADDRESS T x; +struct Elements::value>, T, Ts...> + : Elements { + struct alignas(T) Data { + unsigned char bytes[sizeof(T)]; }; - U u; + Data x; + Elements() {} + T* ptr() { return reinterpret_cast(x.bytes); } + const T* ptr() const { return reinterpret_cast(x.bytes); } +}; +template +struct Elements::value>, T, Ts...> + : Elements { + T* ptr() { return reinterpret_cast(this); } + const T* ptr() const { return reinterpret_cast(this); } }; template <> -struct Elements<> {}; +struct Elements {}; // Element accessor for Elements<> // Provides a static method f that returns a pointer to the value of element I @@ -58,17 +66,17 @@ struct GetElem; template struct GetElem<0, T, Ts...> { - static T* f(Elements* e) { return &e->u.x; } - static const T* f(const Elements* e) { return &e->u.x; } + static T* f(Elements* e) { return e->ptr(); } + static const T* f(const Elements* e) { return e->ptr(); } }; template struct GetElem { - static auto f(Elements* e) + static auto f(Elements* e) -> decltype(GetElem::f(e)) { return GetElem::f(e); } - static auto f(const Elements* e) + static auto f(const Elements* e) -> decltype(GetElem::f(e)) { return GetElem::f(e); } @@ -326,6 +334,15 @@ class Table { absl::index_sequence()...>()); } + // Iterate through each set field in the table if it exists in Vs, in the + // order of Vs. For each existing field, call the filter function. If the + // function returns true, keep the field. Otherwise, remove the field. + template + void FilterIn(F f) { + FilterInImpl(std::move(f), + absl::index_sequence()...>()); + } + // Count the number of set fields in the table size_t count() const { return present_bits_.count(); } @@ -340,7 +357,7 @@ class Table { // the default) -- one bit for each type in Ts. using PresentBits = BitSet; // The tuple-like backing structure for Table. - using Elements = table_detail::Elements; + using Elements = table_detail::Elements; // Extractor from Elements template using GetElem = table_detail::GetElem; @@ -407,6 +424,18 @@ class Table { } } + // Call (*f)(value) if that value is in the table. + // If the value is present in the table and (*f)(value) returns false, remove + // the value from the table. + template + void FilterIf(F* f) { + if (auto* p = get()) { + if (!(*f)(*p)) { + clear(); + } + } + } + // For each field (element I=0, 1, ...) if that field is present, call its // destructor. template @@ -436,15 +465,22 @@ class Table { table_detail::do_these_things({(CallIf(&f), 1)...}); } + // For each field (element I=0, 1, ...) if that field is present, call f. If + // f returns false, remove the field from the table. + template + void FilterInImpl(F f, absl::index_sequence) { + table_detail::do_these_things({(FilterIf(&f), 1)...}); + } + template void ClearAllImpl(absl::index_sequence) { table_detail::do_these_things({(clear(), 1)...}); } // Bit field indicating which elements are set. - GPR_NO_UNIQUE_ADDRESS PresentBits present_bits_; + PresentBits present_bits_; // The memory to store the elements themselves. - GPR_NO_UNIQUE_ADDRESS Elements elements_; + Elements elements_; }; } // namespace grpc_core diff --git a/deps/grpc/src/core/lib/gprpp/thd.h b/deps/grpc/src/core/lib/gprpp/thd.h index 44ff3b22e3..6662610cd6 100644 --- a/deps/grpc/src/core/lib/gprpp/thd.h +++ b/deps/grpc/src/core/lib/gprpp/thd.h @@ -29,7 +29,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include #include #include diff --git a/deps/grpc/src/core/lib/gprpp/time.h b/deps/grpc/src/core/lib/gprpp/time.h index 1f2a481568..0e57349b78 100644 --- a/deps/grpc/src/core/lib/gprpp/time.h +++ b/deps/grpc/src/core/lib/gprpp/time.h @@ -24,26 +24,13 @@ #include "absl/types/optional.h" #include -#include #include #include #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" -#define GRPC_LOG_EVERY_N_SEC(n, severity, format, ...) \ - do { \ - static std::atomic prev{0}; \ - uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \ - gpr_now(GPR_CLOCK_MONOTONIC)) \ - .milliseconds_after_process_epoch(); \ - if (prev == 0 || now - prev > (n) * 1000) { \ - prev = now; \ - gpr_log(severity, format, __VA_ARGS__); \ - } \ - } while (0) - -#define GRPC_LOG_EVERY_N_SEC_DELAYED(n, severity, format, ...) \ +#define GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG(n, format, ...) \ do { \ static std::atomic prev{0}; \ uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \ @@ -52,7 +39,7 @@ if (prev == 0) prev = now; \ if (now - prev > (n) * 1000) { \ prev = now; \ - gpr_log(severity, format, __VA_ARGS__); \ + VLOG(2) << absl::StrFormat(format, __VA_ARGS__); \ } \ } while (0) @@ -169,6 +156,11 @@ class Timestamp { std::string ToString() const; + template + friend void AbslStringify(Sink& sink, const Timestamp& t) { + sink.Append(t.ToString()); + } + private: explicit constexpr Timestamp(int64_t millis) : millis_(millis) {} @@ -293,6 +285,11 @@ class Duration { // https://developers.google.com/protocol-buffers/docs/proto3#json std::string ToJsonString() const; + template + friend void AbslStringify(Sink& sink, const Duration& t) { + sink.Append(t.ToString()); + } + private: explicit constexpr Duration(int64_t millis) : millis_(millis) {} @@ -377,9 +374,6 @@ inline Timestamp& Timestamp::operator+=(Duration duration) { void TestOnlySetProcessEpoch(gpr_timespec epoch); -std::ostream& operator<<(std::ostream& out, Timestamp timestamp); -std::ostream& operator<<(std::ostream& out, Duration duration); - } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_H diff --git a/deps/grpc/src/core/lib/gprpp/time_util.cc b/deps/grpc/src/core/lib/gprpp/time_util.cc index 3a1cd37637..94ca4e08d8 100644 --- a/deps/grpc/src/core/lib/gprpp/time_util.cc +++ b/deps/grpc/src/core/lib/gprpp/time_util.cc @@ -21,7 +21,6 @@ #include "absl/log/check.h" -#include #include #include diff --git a/deps/grpc/src/core/lib/gprpp/unique_type_name.h b/deps/grpc/src/core/lib/gprpp/unique_type_name.h index 2e71ab73f0..4fc7c75ed4 100644 --- a/deps/grpc/src/core/lib/gprpp/unique_type_name.h +++ b/deps/grpc/src/core/lib/gprpp/unique_type_name.h @@ -64,19 +64,12 @@ class UniqueTypeName { Factory(const Factory&) = delete; Factory& operator=(const Factory&) = delete; - UniqueTypeName Create() { return UniqueTypeName(*name_); } + UniqueTypeName Create() const { return UniqueTypeName(*name_); } private: std::string* name_; }; - // Copyable. - UniqueTypeName(const UniqueTypeName& other) : name_(other.name_) {} - UniqueTypeName& operator=(const UniqueTypeName& other) { - name_ = other.name_; - return *this; - } - bool operator==(const UniqueTypeName& other) const { return name_.data() == other.name_.data(); } @@ -87,18 +80,45 @@ class UniqueTypeName { return name_.data() < other.name_.data(); } + template + friend H AbslHashValue(H h, const UniqueTypeName& name) { + return H::combine(std::move(h), + static_cast(name.name_.data())); + } + int Compare(const UniqueTypeName& other) const { return QsortCompare(name_.data(), other.name_.data()); } absl::string_view name() const { return name_; } + template + friend void AbslStringify(Sink& sink, const UniqueTypeName& name) { + sink.Append(name.name_); + } + private: explicit UniqueTypeName(absl::string_view name) : name_(name) {} absl::string_view name_; }; +// Given a type with a member `static absl::string_view TypeName()`, returns a +// UniqueTypeName instance who's string value is the value of TypeName. +template +UniqueTypeName UniqueTypeNameFor() { + static UniqueTypeName::Factory factory(T::TypeName()); + return factory.Create(); +} + } // namespace grpc_core +// Creates a one-off UniqueTypeName in-place. +// Duplicate calls yield different UniqueTypeName instances. +#define GRPC_UNIQUE_TYPE_NAME_HERE(name) \ + ([] { \ + static const ::grpc_core::UniqueTypeName::Factory factory((name)); \ + return factory.Create(); \ + }()) + #endif // GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H diff --git a/deps/grpc/src/core/lib/gprpp/windows/directory_reader.cc b/deps/grpc/src/core/lib/gprpp/windows/directory_reader.cc index 3d45ee6532..2deedb8ca5 100644 --- a/deps/grpc/src/core/lib/gprpp/windows/directory_reader.cc +++ b/deps/grpc/src/core/lib/gprpp/windows/directory_reader.cc @@ -30,8 +30,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include - #include "src/core/lib/gprpp/directory_reader.h" namespace grpc_core { diff --git a/deps/grpc/src/core/lib/gprpp/windows/thd.cc b/deps/grpc/src/core/lib/gprpp/windows/thd.cc index b5c6368cf4..1e754e916b 100644 --- a/deps/grpc/src/core/lib/gprpp/windows/thd.cc +++ b/deps/grpc/src/core/lib/gprpp/windows/thd.cc @@ -27,7 +27,6 @@ #include "absl/log/log.h" #include -#include #include #include #include diff --git a/deps/grpc/src/core/lib/gprpp/work_serializer.cc b/deps/grpc/src/core/lib/gprpp/work_serializer.cc index 45de57f9ba..16ed3fd6e6 100644 --- a/deps/grpc/src/core/lib/gprpp/work_serializer.cc +++ b/deps/grpc/src/core/lib/gprpp/work_serializer.cc @@ -31,7 +31,6 @@ #include "absl/log/log.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -43,6 +42,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -136,10 +136,9 @@ class WorkSerializer::LegacyWorkSerializer final : public WorkSerializerImpl { void WorkSerializer::LegacyWorkSerializer::Run(std::function callback, const DebugLocation& location) { - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::Run() %p Scheduling callback [%s:%d]", - this, location.file(), location.line()); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer::Run() " << this << " Scheduling callback [" + << location.file() << ":" << location.line() << "]"; // Increment queue size for the new callback and owner count to attempt to // take ownership of the WorkSerializer. const uint64_t prev_ref_pair = @@ -162,9 +161,8 @@ void WorkSerializer::LegacyWorkSerializer::Run(std::function callback, refs_.fetch_sub(MakeRefPair(1, 0), std::memory_order_acq_rel); CallbackWrapper* cb_wrapper = new CallbackWrapper(std::move(callback), location); - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, " Scheduling on queue : item %p", cb_wrapper); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << " Scheduling on queue : item " << cb_wrapper; queue_.Push(&cb_wrapper->mpscq_node); } } @@ -173,19 +171,15 @@ void WorkSerializer::LegacyWorkSerializer::Schedule( std::function callback, const DebugLocation& location) { CallbackWrapper* cb_wrapper = new CallbackWrapper(std::move(callback), location); - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, - "WorkSerializer::Schedule() %p Scheduling callback %p [%s:%d]", - this, cb_wrapper, location.file(), location.line()); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer::Schedule() " << this << " Scheduling callback " + << cb_wrapper << " [" << location.file() << ":" << location.line() << "]"; refs_.fetch_add(MakeRefPair(0, 1), std::memory_order_acq_rel); queue_.Push(&cb_wrapper->mpscq_node); } void WorkSerializer::LegacyWorkSerializer::Orphan() { - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::Orphan() %p", this); - } + GRPC_TRACE_LOG(work_serializer, INFO) << "WorkSerializer::Orphan() " << this; const uint64_t prev_ref_pair = refs_.fetch_sub(MakeRefPair(0, 1), std::memory_order_acq_rel); if (GetOwners(prev_ref_pair) == 0 && GetSize(prev_ref_pair) == 1) { @@ -197,9 +191,8 @@ void WorkSerializer::LegacyWorkSerializer::Orphan() { // The thread that calls this loans itself to the work serializer so as to // execute all the scheduled callbacks. void WorkSerializer::LegacyWorkSerializer::DrainQueue() { - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::DrainQueue() %p", this); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer::DrainQueue() " << this; // Attempt to take ownership of the WorkSerializer. Also increment the queue // size as required by `DrainQueueOwned()`. const uint64_t prev_ref_pair = @@ -218,9 +211,8 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueue() { } void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() { - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::DrainQueueOwned() %p", this); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer::DrainQueueOwned() " << this; while (true) { auto prev_ref_pair = refs_.fetch_sub(MakeRefPair(0, 1)); // It is possible that while draining the queue, the last callback ended @@ -265,11 +257,10 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() { GRPC_TRACE_LOG(work_serializer, INFO) << " Queue returned nullptr, trying again"; } - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, " Running item %p : callback scheduled at [%s:%d]", - cb_wrapper, cb_wrapper->location.file(), - cb_wrapper->location.line()); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << " Running item " << cb_wrapper << " : callback scheduled at [" + << cb_wrapper->location.file() << ":" << cb_wrapper->location.line() + << "]"; cb_wrapper->callback(); delete cb_wrapper; } @@ -377,6 +368,8 @@ class WorkSerializer::DispatchingWorkSerializer final // rate of mutex acquisitions per work item tends towards 1. CallbackVector incoming_ ABSL_GUARDED_BY(mu_); + GPR_NO_UNIQUE_ADDRESS latent_see::Flow flow_; + #ifndef NDEBUG static thread_local DispatchingWorkSerializer* running_work_serializer_; #endif @@ -403,10 +396,9 @@ void WorkSerializer::DispatchingWorkSerializer::Orphan() { // Implementation of WorkSerializerImpl::Run void WorkSerializer::DispatchingWorkSerializer::Run( std::function callback, const DebugLocation& location) { - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer[%p] Scheduling callback [%s:%d]", this, - location.file(), location.line()); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer[" << this << "] Scheduling callback [" + << location.file() << ":" << location.line() << "]"; global_stats().IncrementWorkSerializerItemsEnqueued(); MutexLock lock(&mu_); if (!running_) { @@ -428,16 +420,17 @@ void WorkSerializer::DispatchingWorkSerializer::Run( // Implementation of EventEngine::Closure::Run - our actual work loop void WorkSerializer::DispatchingWorkSerializer::Run() { + GRPC_LATENT_SEE_PARENT_SCOPE("WorkSerializer::Run"); + flow_.End(); // TODO(ctiller): remove these when we can deprecate ExecCtx ApplicationCallbackExecCtx app_exec_ctx; ExecCtx exec_ctx; // Grab the last element of processing_ - which is the next item in our // queue since processing_ is stored in reverse order. auto& cb = processing_.back(); - if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer[%p] Executing callback [%s:%d]", this, - cb.location.file(), cb.location.line()); - } + GRPC_TRACE_LOG(work_serializer, INFO) + << "WorkSerializer[" << this << "] Executing callback [" + << cb.location.file() << ":" << cb.location.line() << "]"; // Run the work item. const auto start = std::chrono::steady_clock::now(); SetCurrentThread(); @@ -457,6 +450,7 @@ void WorkSerializer::DispatchingWorkSerializer::Run() { if (processing_.empty() && !Refill()) return; // There's still work in processing_, so schedule ourselves again on // EventEngine. + flow_.Begin(GRPC_LATENT_SEE_METADATA("WorkSerializer::Link")); event_engine_->Run(this); } diff --git a/deps/grpc/src/core/lib/iomgr/buffer_list.cc b/deps/grpc/src/core/lib/iomgr/buffer_list.cc index aedb422707..dd59b4e7d4 100644 --- a/deps/grpc/src/core/lib/iomgr/buffer_list.cc +++ b/deps/grpc/src/core/lib/iomgr/buffer_list.cc @@ -20,7 +20,6 @@ #include "absl/log/log.h" -#include #include #include diff --git a/deps/grpc/src/core/lib/iomgr/call_combiner.cc b/deps/grpc/src/core/lib/iomgr/call_combiner.cc index 21d9edef06..26bb7b881d 100644 --- a/deps/grpc/src/core/lib/iomgr/call_combiner.cc +++ b/deps/grpc/src/core/lib/iomgr/call_combiner.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include #include #include "src/core/lib/gprpp/crash.h" @@ -114,19 +113,15 @@ void CallCombiner::ScheduleClosure(grpc_closure* closure, void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, DEBUG_ARGS const char* reason) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "==> CallCombiner::Start() [%p] closure=%s [" DEBUG_FMT_STR - "%s] error=%s", - this, closure->DebugString().c_str() DEBUG_FMT_ARGS, reason, - StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(call_combiner, INFO) << absl::StrFormat( + "==> CallCombiner::Start() [%p] closure=%s [" DEBUG_FMT_STR + "%s] error=%s", + this, closure->DebugString().c_str() DEBUG_FMT_ARGS, reason, + StatusToString(error).c_str()); size_t prev_size = static_cast(gpr_atm_full_fetch_add(&size_, (gpr_atm)1)); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, - prev_size + 1); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " size: " << prev_size << " -> " << prev_size + 1; if (prev_size == 0) { GRPC_TRACE_LOG(call_combiner, INFO) << " EXECUTING IMMEDIATELY"; // Queue was empty, so execute this closure immediately. @@ -141,16 +136,13 @@ void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, } void CallCombiner::Stop(DEBUG_ARGS const char* reason) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, "==> CallCombiner::Stop() [%p] [" DEBUG_FMT_STR "%s]", - this DEBUG_FMT_ARGS, reason); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << absl::StrFormat("==> CallCombiner::Stop() [%p] [" DEBUG_FMT_STR "%s]", + this DEBUG_FMT_ARGS, reason); size_t prev_size = static_cast(gpr_atm_full_fetch_add(&size_, (gpr_atm)-1)); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, - prev_size - 1); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " size: " << prev_size << " -> " << prev_size - 1; CHECK_GE(prev_size, 1u); if (prev_size > 1) { while (true) { @@ -168,10 +160,9 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { grpc_error_handle error = internal::StatusMoveFromHeapPtr(closure->error_data.error); closure->error_data.error = 0; - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " EXECUTING FROM QUEUE: closure=%s error=%s", - closure->DebugString().c_str(), StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " EXECUTING FROM QUEUE: closure=" << closure->DebugString() + << " error=" << StatusToString(error); ScheduleClosure(closure, error); break; } @@ -187,31 +178,26 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { // If error is set, invoke the cancellation closure immediately. // Otherwise, store the new closure. if (!original_error.ok()) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling notify_on_cancel callback=%p " - "for pre-existing cancellation", - this, closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling notify_on_cancel callback=" << closure + << " for pre-existing cancellation"; ExecCtx::Run(DEBUG_LOCATION, closure, original_error); break; } else { if (gpr_atm_full_cas(&cancel_state_, original_state, reinterpret_cast(closure))) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, "call_combiner=%p: setting notify_on_cancel=%p", - this, closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": setting notify_on_cancel=" << closure; // If we replaced an earlier closure, invoke the original // closure with absl::OkStatus(). This allows callers to clean // up any resources they may be holding for the callback. if (original_state != 0) { closure = reinterpret_cast(original_state); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling old cancel callback=%p", this, - closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling old cancel callback=" << closure; ExecCtx::Run(DEBUG_LOCATION, closure, absl::OkStatus()); } break; @@ -235,11 +221,9 @@ void CallCombiner::Cancel(grpc_error_handle error) { if (original_state != 0) { grpc_closure* notify_on_cancel = reinterpret_cast(original_state); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling notify_on_cancel callback=%p", - this, notify_on_cancel); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling notify_on_cancel callback=" << notify_on_cancel; ExecCtx::Run(DEBUG_LOCATION, notify_on_cancel, error); } break; diff --git a/deps/grpc/src/core/lib/iomgr/call_combiner.h b/deps/grpc/src/core/lib/iomgr/call_combiner.h index 0d96950577..87ad024880 100644 --- a/deps/grpc/src/core/lib/iomgr/call_combiner.h +++ b/deps/grpc/src/core/lib/iomgr/call_combiner.h @@ -22,6 +22,7 @@ #include #include "absl/container/inlined_vector.h" +#include "absl/log/log.h" #include #include @@ -165,13 +166,12 @@ class CallCombinerClosureList { GRPC_CALL_COMBINER_START(call_combiner, closure.closure, closure.error, closure.reason); } - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "CallCombinerClosureList executing closure while already " - "holding call_combiner %p: closure=%s error=%s reason=%s", - call_combiner, closures_[0].closure->DebugString().c_str(), - StatusToString(closures_[0].error).c_str(), closures_[0].reason); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "CallCombinerClosureList executing closure while already " + "holding call_combiner " + << call_combiner << ": closure=" << closures_[0].closure->DebugString() + << " error=" << StatusToString(closures_[0].error) + << " reason=" << closures_[0].reason; // This will release the call combiner. ExecCtx::Run(DEBUG_LOCATION, closures_[0].closure, closures_[0].error); closures_.clear(); diff --git a/deps/grpc/src/core/lib/iomgr/cfstream_handle.cc b/deps/grpc/src/core/lib/iomgr/cfstream_handle.cc index faee427f2b..55604791a7 100644 --- a/deps/grpc/src/core/lib/iomgr/cfstream_handle.cc +++ b/deps/grpc/src/core/lib/iomgr/cfstream_handle.cc @@ -24,6 +24,8 @@ #ifdef GRPC_CFSTREAM #import +#include "absl/log/log.h" + #include #include #include @@ -63,10 +65,9 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream, grpc_error_handle error; CFErrorRef stream_error; CFStreamHandle* handle = static_cast(client_callback_info); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream ReadCallback (%p, %p, %lu, %p)", handle, - stream, type, client_callback_info); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream ReadCallback (" << handle << ", " + << stream << ", " << type << ", " + << client_callback_info << ")"; switch (type) { case kCFStreamEventOpenCompleted: handle->open_event_.SetReady(); @@ -97,10 +98,9 @@ void CFStreamHandle::WriteCallback(CFWriteStreamRef stream, grpc_error_handle error; CFErrorRef stream_error; CFStreamHandle* handle = static_cast(clientCallBackInfo); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream WriteCallback (%p, %p, %lu, %p)", handle, - stream, type, clientCallBackInfo); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream WriteCallback (" << handle << ", " + << stream << ", " << type << ", " + << clientCallBackInfo << ")"; switch (type) { case kCFStreamEventOpenCompleted: handle->open_event_.SetReady(); @@ -176,9 +176,8 @@ void CFStreamHandle::Shutdown(grpc_error_handle error) { void CFStreamHandle::Ref(const char* file, int line, const char* reason) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&refcount_.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream Handle ref %p : %s %" PRIdPTR " -> %" PRIdPTR, this, - reason, val, val + 1); + VLOG(2).AtLocation(file, line) << "CFStream Handle ref " << this << " : " + << reason << " " << val << " -> " << val + 1; } gpr_ref(&refcount_); } @@ -186,9 +185,8 @@ void CFStreamHandle::Ref(const char* file, int line, const char* reason) { void CFStreamHandle::Unref(const char* file, int line, const char* reason) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&refcount_.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream Handle unref %p : %s %" PRIdPTR " -> %" PRIdPTR, this, - reason, val, val - 1); + VLOG(2).AtLocation(file, line) << "CFStream Handle unref " << this << " : " + << reason << " " << val << " -> " << val - 1; } if (gpr_unref(&refcount_)) { delete this; diff --git a/deps/grpc/src/core/lib/iomgr/closure.h b/deps/grpc/src/core/lib/iomgr/closure.h index efdb25f2fd..9f8a22493d 100644 --- a/deps/grpc/src/core/lib/iomgr/closure.h +++ b/deps/grpc/src/core/lib/iomgr/closure.h @@ -23,9 +23,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/gprpp/crash.h" @@ -292,18 +292,15 @@ class Closure { return; } #ifndef NDEBUG - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "running closure %p: created [%s:%d]: run [%s:%d]", - closure, closure->file_created, closure->line_created, - location.file(), location.line()); - } + GRPC_TRACE_VLOG(closure, 2) + << "running closure " << closure << ": created [" + << closure->file_created << ":" << closure->line_created << "]: run [" + << location.file() << ":" << location.line() << "]"; CHECK_NE(closure->cb, nullptr); #endif closure->cb(closure->cb_arg, error); #ifndef NDEBUG - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "closure %p finished", closure); - } + GRPC_TRACE_VLOG(closure, 2) << "closure " << closure << " finished"; #endif } }; diff --git a/deps/grpc/src/core/lib/iomgr/combiner.cc b/deps/grpc/src/core/lib/iomgr/combiner.cc index 348df4a0cb..56db07f562 100644 --- a/deps/grpc/src/core/lib/iomgr/combiner.cc +++ b/deps/grpc/src/core/lib/iomgr/combiner.cc @@ -23,9 +23,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/experiments/experiments.h" @@ -34,13 +34,6 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#define GRPC_COMBINER_TRACE(fn) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(combiner)) { \ - fn; \ - } \ - } while (0) - #define STATE_UNORPHANED 1 #define STATE_ELEM_COUNT_LOW_BIT 2 @@ -58,33 +51,32 @@ grpc_core::Combiner* grpc_combiner_create( gpr_ref_init(&lock->refs, 1); gpr_atm_no_barrier_store(&lock->state, STATE_UNORPHANED); grpc_closure_list_init(&lock->final_list); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p create", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " create"; return lock; } static void really_destroy(grpc_core::Combiner* lock) { - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p really_destroy", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " really_destroy"; CHECK_EQ(gpr_atm_no_barrier_load(&lock->state), 0); delete lock; } static void start_destroy(grpc_core::Combiner* lock) { gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_UNORPHANED); - GRPC_COMBINER_TRACE(gpr_log( - GPR_INFO, "C:%p really_destroy old_state=%" PRIdPTR, lock, old_state)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " really_destroy old_state=" << old_state; if (old_state == 1) { really_destroy(lock); } } #ifndef NDEBUG -#define GRPC_COMBINER_DEBUG_SPAM(op, delta) \ - if (GRPC_TRACE_FLAG_ENABLED(combiner)) { \ - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, \ - "C:%p %s %" PRIdPTR " --> %" PRIdPTR " %s", lock, (op), \ - gpr_atm_no_barrier_load(&lock->refs.count), \ - gpr_atm_no_barrier_load(&lock->refs.count) + (delta), reason); \ - } +#define GRPC_COMBINER_DEBUG_SPAM(op, delta) \ + GRPC_TRACE_VLOG(combiner, 2).AtLocation(file, line) \ + << "C:" << lock << " " << (op) << " " \ + << gpr_atm_no_barrier_load(&lock->refs.count) << " --> " \ + << gpr_atm_no_barrier_load(&lock->refs.count) + (delta) << " " \ + << reason; #else #define GRPC_COMBINER_DEBUG_SPAM(op, delta) #endif @@ -128,9 +120,8 @@ static void push_first_on_exec_ctx(grpc_core::Combiner* lock) { static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl, grpc_error_handle error) { gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, - "C:%p grpc_combiner_execute c=%p last=%" PRIdPTR, - lock, cl, last)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_execute c=" << cl << " last=" << last; if (last == 1) { gpr_atm_no_barrier_store( &lock->initiating_exec_ctx_or_null, @@ -169,7 +160,7 @@ static void queue_offload(grpc_core::Combiner* lock) { // Make the combiner look uncontended by storing a non-null value here, so // that we don't immediately offload again. gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 1); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p queue_offload", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " queue_offload"; lock->event_engine->Run([lock] { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx(0); @@ -188,14 +179,11 @@ bool grpc_combiner_continue_exec_ctx() { bool contended = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null) == 0; - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, - "C:%p grpc_combiner_continue_exec_ctx " - "contended=%d " - "exec_ctx_ready_to_finish=%d " - "time_to_execute_final_list=%d", - lock, contended, - grpc_core::ExecCtx::Get()->IsReadyToFinish(), - lock->time_to_execute_final_list)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_continue_exec_ctx " + << "contended=" << contended << " exec_ctx_ready_to_finish=" + << grpc_core::ExecCtx::Get()->IsReadyToFinish() + << " time_to_execute_final_list=" << lock->time_to_execute_final_list; // offload only if both (1) the combiner is contended and has more than one // closure to execute, and (2) the current execution context needs to finish @@ -212,8 +200,9 @@ bool grpc_combiner_continue_exec_ctx() { // priority (gpr_atm_acq_load(&lock->state) >> 1) > 1) { grpc_core::MultiProducerSingleConsumerQueue::Node* n = lock->queue.Pop(); - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p maybe_finish_one n=%p", lock, n)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " maybe_finish_one n=" << n; + if (n == nullptr) { // queue is in an inconsistent state: use this as a cue that we should // go off and do something else for a while (and come back later) @@ -234,8 +223,8 @@ bool grpc_combiner_continue_exec_ctx() { grpc_closure_list_init(&lock->final_list); int loops = 0; while (c != nullptr) { - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p execute_final[%d] c=%p", lock, loops, c)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " execute_final[" << loops << "] c=" << c; grpc_closure* next = c->next_data.next; #ifndef NDEBUG c->scheduled = false; @@ -252,8 +241,8 @@ bool grpc_combiner_continue_exec_ctx() { lock->time_to_execute_final_list = false; gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_ELEM_COUNT_LOW_BIT); - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p finish old_state=%" PRIdPTR, lock, old_state)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " finish old_state=" << old_state; // Define a macro to ease readability of the following switch statement. #define OLD_STATE_WAS(orphaned, elem_count) \ (((orphaned) ? 0 : STATE_UNORPHANED) | \ @@ -294,9 +283,9 @@ static void combiner_finally_exec(grpc_core::Combiner* lock, grpc_closure* closure, grpc_error_handle error) { CHECK_NE(lock, nullptr); - GRPC_COMBINER_TRACE(gpr_log( - GPR_INFO, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, closure, - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_execute_finally c=" << closure + << "; ac=" << grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) { // Using error_data.scratch to store the combiner so that it can be accessed // in enqueue_finally. diff --git a/deps/grpc/src/core/lib/iomgr/endpoint.h b/deps/grpc/src/core/lib/iomgr/endpoint.h index a0f5d8429f..c4b70abe4f 100644 --- a/deps/grpc/src/core/lib/iomgr/endpoint.h +++ b/deps/grpc/src/core/lib/iomgr/endpoint.h @@ -101,6 +101,8 @@ bool grpc_endpoint_can_track_err(grpc_endpoint* ep); struct grpc_endpoint { const grpc_endpoint_vtable* vtable; + + void Orphan() { grpc_endpoint_destroy(this); } }; #endif // GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H diff --git a/deps/grpc/src/core/lib/iomgr/endpoint_cfstream.cc b/deps/grpc/src/core/lib/iomgr/endpoint_cfstream.cc index 3ce89bf7aa..c542c6ae6b 100644 --- a/deps/grpc/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/deps/grpc/src/core/lib/iomgr/endpoint_cfstream.cc @@ -25,6 +25,7 @@ #import #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -75,9 +76,8 @@ static void CFStreamUnref(CFStreamEndpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream endpoint unref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, - reason, val, val - 1); + VLOG(2).AtLocation(file, line) << "CFStream endpoint unref " << ep << " : " + << reason << " " << val << " -> " << val - 1; } if (gpr_unref(&ep->refcount)) { CFStreamFree(ep); @@ -87,9 +87,8 @@ static void CFStreamRef(CFStreamEndpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream endpoint ref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, - reason, val, val + 1); + VLOG(2).AtLocation(file, line) << "CFStream endpoint ref " << ep << " : " + << reason << " " << val << " -> " << val + 1; } gpr_ref(&ep->refcount); } @@ -111,17 +110,15 @@ static grpc_error_handle CFStreamAnnotateError(grpc_error_handle src_error) { static void CallReadCb(CFStreamEndpoint* ep, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp) && ABSL_VLOG_IS_ON(2)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p call_read_cb %p %p:%p", ep, - ep->read_cb, ep->read_cb->cb, ep->read_cb->cb_arg); + VLOG(2) << "CFStream endpoint:" << ep << " call_read_cb " << ep->read_cb + << " " << ep->read_cb->cb << ":" << ep->read_cb->cb_arg; size_t i; - gpr_log(GPR_DEBUG, "read: error=%s", - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "read: error=" << grpc_core::StatusToString(error); for (i = 0; i < ep->read_slices->count; i++) { char* dump = grpc_dump_slice(ep->read_slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ %p (peer=%s): %s", ep, ep->peer_string.c_str(), - dump); + VLOG(2) << "READ " << ep << " (peer=" << ep->peer_string << "): " << dump; gpr_free(dump); } } @@ -132,12 +129,10 @@ static void CallReadCb(CFStreamEndpoint* ep, grpc_error_handle error) { } static void CallWriteCb(CFStreamEndpoint* ep, grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p call_write_cb %p %p:%p", ep, - ep->write_cb, ep->write_cb->cb, ep->write_cb->cb_arg); - gpr_log(GPR_DEBUG, "write: error=%s", - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream endpoint:" << ep << " call_write_cb " + << ep->write_cb << " " << ep->write_cb->cb << ":" + << ep->write_cb->cb_arg << "write: error=" + << grpc_core::StatusToString(error); grpc_closure* cb = ep->write_cb; ep->write_cb = nullptr; ep->write_slices = nullptr; @@ -224,8 +219,8 @@ static void WriteAction(void* arg, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp) && ABSL_VLOG_IS_ON(2)) { grpc_slice trace_slice = grpc_slice_sub(slice, 0, write_size); char* dump = grpc_dump_slice(trace_slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE %p (peer=%s): %s", ep, ep->peer_string.c_str(), - dump); + VLOG(2) << "WRITE " << ep << " (peer=" << ep->peer_string + << "): " << dump; gpr_free(dump); grpc_core::CSliceUnref(trace_slice); } @@ -237,10 +232,9 @@ static void CFStreamRead(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb, bool /*urgent*/, int /*min_progress_size*/) { CFStreamEndpoint* ep_impl = reinterpret_cast(ep); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p read (%p, %p) length:%zu", ep_impl, - slices, cb, slices->length); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream endpoint:" << ep_impl << " read (" + << slices << ", " << cb + << ") length:" << slices->length; CHECK_EQ(ep_impl->read_cb, nullptr); ep_impl->read_cb = cb; ep_impl->read_slices = slices; @@ -255,10 +249,9 @@ static void CFStreamWrite(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb, void* /*arg*/, int /*max_frame_size*/) { CFStreamEndpoint* ep_impl = reinterpret_cast(ep); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p write (%p, %p) length:%zu", - ep_impl, slices, cb, slices->length); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream endpoint:" << ep_impl << " write (" + << slices << ", " << cb + << ") length:" << slices->length; CHECK_EQ(ep_impl->write_cb, nullptr); ep_impl->write_cb = cb; ep_impl->write_slices = slices; @@ -312,11 +305,9 @@ grpc_endpoint* grpc_cfstream_endpoint_create(CFReadStreamRef read_stream, const char* peer_string, CFStreamHandle* stream_sync) { CFStreamEndpoint* ep_impl = new CFStreamEndpoint; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, - "CFStream endpoint:%p create readStream:%p writeStream: %p", - ep_impl, read_stream, write_stream); - } + GRPC_TRACE_VLOG(tcp, 2) << "CFStream endpoint:" << ep_impl + << " create readStream:" << read_stream + << " writeStream: " << write_stream; ep_impl->base.vtable = &vtable; gpr_ref_init(&ep_impl->refcount, 1); ep_impl->read_stream = read_stream; diff --git a/deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc b/deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc index 42d0e7acdb..4043f9a812 100644 --- a/deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -34,7 +34,6 @@ #include "absl/strings/str_cat.h" #include -#include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/error.cc b/deps/grpc/src/core/lib/iomgr/error.cc index d646b9a8a5..d130383455 100644 --- a/deps/grpc/src/core/lib/iomgr/error.cc +++ b/deps/grpc/src/core/lib/iomgr/error.cc @@ -21,12 +21,12 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -221,7 +221,7 @@ grpc_error_handle grpc_error_add_child(grpc_error_handle src, bool grpc_log_error(const char* what, grpc_error_handle error, const char* file, int line) { DCHECK(!error.ok()); - gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, "%s: %s", what, - grpc_core::StatusToString(error).c_str()); + LOG(ERROR).AtLocation(file, line) + << what << ": " << grpc_core::StatusToString(error); return false; } diff --git a/deps/grpc/src/core/lib/iomgr/error.h b/deps/grpc/src/core/lib/iomgr/error.h index 4d38a90c25..b31173121f 100644 --- a/deps/grpc/src/core/lib/iomgr/error.h +++ b/deps/grpc/src/core/lib/iomgr/error.h @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/deps/grpc/src/core/lib/iomgr/ev_apple.cc b/deps/grpc/src/core/lib/iomgr/ev_apple.cc index f0b205314e..88f07921f3 100644 --- a/deps/grpc/src/core/lib/iomgr/ev_apple.cc +++ b/deps/grpc/src/core/lib/iomgr/ev_apple.cc @@ -39,15 +39,6 @@ #include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/ev_apple.h" -#ifndef NDEBUG -#define GRPC_POLLING_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(apple_polling)) { \ - gpr_log(GPR_DEBUG, "(polling) " format, __VA_ARGS__); \ - } -#else -#define GRPC_POLLING_TRACE(...) -#endif // NDEBUG - #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) struct GlobalRunLoopContext { @@ -117,7 +108,8 @@ static void grpc_apple_register_write_stream_queue( /// the global run loop thread gGlobalRunLoopThread. static void grpc_apple_register_read_stream_run_loop( CFReadStreamRef read_stream, dispatch_queue_t /*dispatch_queue*/) { - GRPC_POLLING_TRACE("Register read stream: %p", read_stream); + GRPC_TRACE_VLOG(apple_polling, 2) + << "(polling) Register read stream: " << read_stream; grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu); CFReadStreamScheduleWithRunLoop(read_stream, gGlobalRunLoopContext->run_loop, kCFRunLoopDefaultMode); @@ -130,7 +122,8 @@ static void grpc_apple_register_read_stream_run_loop( /// by the global run loop thread gGlobalRunLoopThread. static void grpc_apple_register_write_stream_run_loop( CFWriteStreamRef write_stream, dispatch_queue_t /*dispatch_queue*/) { - GRPC_POLLING_TRACE("Register write stream: %p", write_stream); + GRPC_TRACE_VLOG(apple_polling, 2) + << "(polling) Register write stream: " << write_stream; grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu); CFWriteStreamScheduleWithRunLoop( write_stream, gGlobalRunLoopContext->run_loop, kCFRunLoopDefaultMode); @@ -220,9 +213,9 @@ static void pollset_global_shutdown(void) { static grpc_error_handle pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_core::Timestamp deadline) { - GRPC_POLLING_TRACE("pollset work: %p, worker: %p, deadline: %" PRIu64, - pollset, worker, - deadline.milliseconds_after_process_epoch()); + GRPC_TRACE_VLOG(apple_polling, 2) + << "(polling) pollset work: " << pollset << ", worker: " << worker + << ", deadline: " << deadline.milliseconds_after_process_epoch(); GrpcApplePollset* apple_pollset = reinterpret_cast(pollset); GrpcAppleWorker actual_worker; @@ -276,7 +269,8 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, GrpcApplePollset* apple_pollset = reinterpret_cast(pollset); - GRPC_POLLING_TRACE("pollset kick: %p, worker:%p", pollset, specific_worker); + GRPC_TRACE_VLOG(apple_polling, 2) << "(polling) pollset kick: " << pollset + << ", worker:" << specific_worker; if (specific_worker == nullptr) { if (apple_pollset->workers.empty()) { @@ -299,7 +293,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, } static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { - GRPC_POLLING_TRACE("pollset init: %p", pollset); + GRPC_TRACE_VLOG(apple_polling, 2) << "(polling) pollset init: " << pollset; GrpcApplePollset* apple_pollset = new (pollset) GrpcApplePollset(); *mu = grpc_core::GetUnderlyingGprMu(&apple_pollset->mu); } @@ -307,7 +301,8 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { /// The caller must acquire the lock GrpcApplePollset.mu before calling this /// function. static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { - GRPC_POLLING_TRACE("pollset shutdown: %p", pollset); + GRPC_TRACE_VLOG(apple_polling, 2) + << "(polling) pollset shutdown: " << pollset; GrpcApplePollset* apple_pollset = reinterpret_cast(pollset); @@ -323,7 +318,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { } static void pollset_destroy(grpc_pollset* pollset) { - GRPC_POLLING_TRACE("pollset destroy: %p", pollset); + GRPC_TRACE_VLOG(apple_polling, 2) << "(polling) pollset destroy: " << pollset; GrpcApplePollset* apple_pollset = reinterpret_cast(pollset); apple_pollset->~GrpcApplePollset(); diff --git a/deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc b/deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc index 6b4ebacac9..c2c60e9663 100644 --- a/deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -16,9 +16,6 @@ // // -#include "absl/log/check.h" - -#include #include #include "src/core/lib/gprpp/crash.h" @@ -41,6 +38,7 @@ #include #include +#include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -362,9 +360,8 @@ static grpc_fd* fd_create(int fd, const char* name, bool track_err) { grpc_iomgr_register_object(&new_fd->iomgr_object, fd_name.c_str()); fork_fd_list_add_grpc_fd(new_fd); #ifndef NDEBUG - if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, "FD %d %p create %s", fd, new_fd, fd_name.c_str()); - } + GRPC_TRACE_VLOG(fd_refcount, 2) + << "FD " << fd << " " << new_fd << " create " << fd_name; #endif struct epoll_event ev; @@ -377,8 +374,7 @@ static grpc_fd* fd_create(int fd, const char* name, bool track_err) { ev.data.ptr = reinterpret_cast(reinterpret_cast(new_fd) | (track_err ? 1 : 0)); if (epoll_ctl(g_epoll_set.epfd, EPOLL_CTL_ADD, fd, &ev) != 0) { - gpr_log(GPR_ERROR, "epoll_ctl failed: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "epoll_ctl failed: " << grpc_core::StrError(errno); } return new_fd; @@ -401,8 +397,7 @@ static void fd_shutdown_internal(grpc_fd* fd, grpc_error_handle why, epoll_event phony_event; if (epoll_ctl(g_epoll_set.epfd, EPOLL_CTL_DEL, fd->fd, &phony_event) != 0) { - gpr_log(GPR_ERROR, "epoll_ctl failed: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "epoll_ctl failed: " << grpc_core::StrError(errno); } } fd->write_closure->SetShutdown(why); @@ -731,9 +726,8 @@ static grpc_error_handle do_epoll_wait(grpc_pollset* ps, if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "ps: %p poll got %d events", ps, r); - } + GRPC_TRACE_LOG(polling, INFO) + << "ps: " << ps << " poll got " << r << " events"; gpr_atm_rel_store(&g_epoll_set.num_events, r); gpr_atm_rel_store(&g_epoll_set.cursor, 0); @@ -750,9 +744,8 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->schedule_on_end_work = (grpc_closure_list)GRPC_CLOSURE_LIST_INIT; pollset->begin_refs++; - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_STARTS:%p", pollset, worker); - } + GRPC_TRACE_LOG(polling, INFO) + << "PS:" << pollset << " BEGIN_STARTS:" << worker; if (pollset->seen_inactive) { // pollset has been observed to be inactive, we need to move back to the @@ -769,11 +762,10 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, retry_lock_neighborhood: gpr_mu_lock(&neighborhood->mu); gpr_mu_lock(&pollset->mu); - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_REORG:%p kick_state=%s is_reassigning=%d", - pollset, worker, kick_state_string(worker->state), - is_reassigning); - } + GRPC_TRACE_LOG(polling, INFO) + << "PS:" << pollset << " BEGIN_REORG:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " is_reassigning=" << is_reassigning; if (pollset->seen_inactive) { if (neighborhood != pollset->neighborhood) { gpr_mu_unlock(&neighborhood->mu); @@ -822,11 +814,10 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->initialized_cv = true; gpr_cv_init(&worker->cv); while (worker->state == UNKICKED && !pollset->shutting_down) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_WAIT:%p kick_state=%s shutdown=%d", - pollset, worker, kick_state_string(worker->state), - pollset->shutting_down); - } + GRPC_TRACE_LOG(polling, INFO) + << "PS:" << pollset << " BEGIN_WAIT:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " shutdown=" << pollset->shutting_down; if (gpr_cv_wait(&worker->cv, &pollset->mu, deadline.as_timespec(GPR_CLOCK_MONOTONIC)) && @@ -839,13 +830,11 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_core::ExecCtx::Get()->InvalidateNow(); } - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, - "PS:%p BEGIN_DONE:%p kick_state=%s shutdown=%d " - "kicked_without_poller: %d", - pollset, worker, kick_state_string(worker->state), - pollset->shutting_down, pollset->kicked_without_poller); - } + GRPC_TRACE_LOG(polling, INFO) + << "PS:" << pollset << " BEGIN_DONE:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " shutdown=" << pollset->shutting_down + << " kicked_without_poller: " << pollset->kicked_without_poller; // We release pollset lock in this function at a couple of places: // 1. Briefly when assigning pollset to a neighborhood @@ -882,18 +871,15 @@ static bool check_neighborhood_for_available_poller( if (gpr_atm_no_barrier_cas( &g_active_poller, 0, reinterpret_cast(inspect_worker))) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. choose next poller to be %p", - inspect_worker); - } + GRPC_TRACE_LOG(polling, INFO) + << " .. choose next poller to be " << inspect_worker; SET_KICK_STATE(inspect_worker, DESIGNATED_POLLER); if (inspect_worker->initialized_cv) { gpr_cv_signal(&inspect_worker->cv); } } else { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. beaten to choose next poller"; - } + GRPC_TRACE_LOG(polling, INFO) + << " .. beaten to choose next poller"; } // even if we didn't win the cas, there's a worker, we can stop found_worker = true; @@ -909,9 +895,8 @@ static bool check_neighborhood_for_available_poller( } while (!found_worker && inspect_worker != inspect->root_worker); } if (!found_worker) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. mark pollset %p inactive", inspect); - } + GRPC_TRACE_LOG(polling, INFO) + << " .. mark pollset " << inspect << " inactive"; inspect->seen_inactive = true; if (inspect == neighborhood->active_root) { neighborhood->active_root = @@ -928,9 +913,7 @@ static bool check_neighborhood_for_available_poller( static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p END_WORKER:%p", pollset, worker); - } + GRPC_TRACE_LOG(polling, INFO) << "PS:" << pollset << " END_WORKER:" << worker; if (worker_hdl != nullptr) *worker_hdl = nullptr; // Make sure we appear kicked SET_KICK_STATE(worker, KICKED); @@ -939,9 +922,8 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, if (gpr_atm_no_barrier_load(&g_active_poller) == reinterpret_cast(worker)) { if (worker->next != worker && worker->next->state == UNKICKED) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. choose next poller to be peer %p", worker); - } + GRPC_TRACE_LOG(polling, INFO) + << " .. choose next poller to be peer " << worker; CHECK(worker->next->initialized_cv); gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next); SET_KICK_STATE(worker->next, DESIGNATED_POLLER); @@ -990,9 +972,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, if (worker->initialized_cv) { gpr_cv_destroy(&worker->cv); } - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. remove worker"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. remove worker"; if (EMPTIED == worker_remove(pollset, worker)) { pollset_maybe_finish_shutdown(pollset); } @@ -1073,7 +1053,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, log.push_back(absl::StrFormat(" worker_kick_state=%s", kick_state_string(specific_worker->state))); } - gpr_log(GPR_DEBUG, "%s", absl::StrJoin(log, "").c_str()); + VLOG(2) << absl::StrJoin(log, ""); } if (specific_worker == nullptr) { @@ -1081,22 +1061,16 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* root_worker = pollset->root_worker; if (root_worker == nullptr) { pollset->kicked_without_poller = true; - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. kicked_without_poller"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. kicked_without_poller"; goto done; } grpc_pollset_worker* next_worker = root_worker->next; if (root_worker->state == KICKED) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. already kicked %p", root_worker); - } + GRPC_TRACE_LOG(polling, INFO) << " .. already kicked " << root_worker; SET_KICK_STATE(root_worker, KICKED); goto done; } else if (next_worker->state == KICKED) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. already kicked %p", next_worker); - } + GRPC_TRACE_LOG(polling, INFO) << " .. already kicked " << next_worker; SET_KICK_STATE(next_worker, KICKED); goto done; } else if (root_worker == next_worker && // only try and wake up a poller @@ -1104,38 +1078,30 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, root_worker == reinterpret_cast( gpr_atm_no_barrier_load(&g_active_poller))) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. kicked %p", root_worker); - } + GRPC_TRACE_LOG(polling, INFO) << " .. kicked " << root_worker; SET_KICK_STATE(root_worker, KICKED); ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (next_worker->state == UNKICKED) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. kicked %p", next_worker); - } + GRPC_TRACE_LOG(polling, INFO) << " .. kicked " << next_worker; CHECK(next_worker->initialized_cv); SET_KICK_STATE(next_worker, KICKED); gpr_cv_signal(&next_worker->cv); goto done; } else if (next_worker->state == DESIGNATED_POLLER) { if (root_worker->state != DESIGNATED_POLLER) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log( - GPR_INFO, - " .. kicked root non-poller %p (initialized_cv=%d) (poller=%p)", - root_worker, root_worker->initialized_cv, next_worker); - } + GRPC_TRACE_LOG(polling, INFO) + << " .. kicked root non-poller " << root_worker + << " (initialized_cv=" << root_worker->initialized_cv + << ") (poller=" << next_worker << ")"; SET_KICK_STATE(root_worker, KICKED); if (root_worker->initialized_cv) { gpr_cv_signal(&root_worker->cv); } goto done; } else { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. non-root poller %p (root=%p)", next_worker, - root_worker); - } + GRPC_TRACE_LOG(polling, INFO) << " .. non-root poller " << next_worker + << " (root=" << root_worker << ")"; SET_KICK_STATE(next_worker, KICKED); ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; @@ -1146,9 +1112,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, goto done; } } else { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. kicked while waking up"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. kicked while waking up"; goto done; } @@ -1156,36 +1120,27 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, } if (specific_worker->state == KICKED) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. specific worker already kicked"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. specific worker already kicked"; goto done; } else if (g_current_thread_worker == specific_worker) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. mark %p kicked", specific_worker); - } + GRPC_TRACE_LOG(polling, INFO) + << " .. mark " << specific_worker << " kicked"; SET_KICK_STATE(specific_worker, KICKED); goto done; } else if (specific_worker == reinterpret_cast( gpr_atm_no_barrier_load(&g_active_poller))) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. kick active poller"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. kick active poller"; SET_KICK_STATE(specific_worker, KICKED); ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (specific_worker->initialized_cv) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. kick waiting worker"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. kick waiting worker"; SET_KICK_STATE(specific_worker, KICKED); gpr_cv_signal(&specific_worker->cv); goto done; } else { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - LOG(INFO) << " .. kick non-waiting worker"; - } + GRPC_TRACE_LOG(polling, INFO) << " .. kick non-waiting worker"; SET_KICK_STATE(specific_worker, KICKED); goto done; } diff --git a/deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc b/deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc index 049787596d..a95adea7c8 100644 --- a/deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc @@ -39,7 +39,6 @@ #include "absl/strings/str_format.h" #include -#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" @@ -333,12 +332,11 @@ static void fork_fd_list_add_wakeup_fd(grpc_cached_wakeup_fd* fd) { #define UNREF_BY(fd, n, reason) unref_by(fd, n, reason, __FILE__, __LINE__) static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { - if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, - "FD %d %p ref %d %" PRIdPTR " -> %" PRIdPTR " [%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); - } + GRPC_TRACE_VLOG(fd_refcount, 2) + << "FD " << fd->fd << " " << fd << " ref " << 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) \ do { \ @@ -358,12 +356,11 @@ static void ref_by(grpc_fd* fd, int n) { #ifndef NDEBUG static void unref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { - if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, - "FD %d %p unref %d %" PRIdPTR " -> %" PRIdPTR " [%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); - } + GRPC_TRACE_VLOG(fd_refcount, 2) + << "FD " << fd->fd << " " << fd << " unref " << 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) { #endif @@ -1029,9 +1026,7 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, r = grpc_poll_function(pfds, pfd_count, timeout); GRPC_SCHEDULING_END_BLOCKING_REGION; - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p poll=%d", pollset, r); - } + GRPC_TRACE_LOG(polling, INFO) << pollset << " poll=" << r; if (r < 0) { if (errno != EINTR) { @@ -1053,9 +1048,7 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, } } else { if (pfds[0].revents & POLLIN_CHECK) { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p: got_wakeup", pollset); - } + GRPC_TRACE_LOG(polling, INFO) << pollset << ": got_wakeup"; work_combine_error( &error, grpc_wakeup_fd_consume_wakeup(&worker.wakeup_fd->fd)); } @@ -1067,11 +1060,11 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, } fd_end_poll(&watchers[i], 0, 0); } else { - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p got_event: %d r:%d w:%d [%d]", pollset, - pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0, - (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents); - } + GRPC_TRACE_LOG(polling, INFO) + << pollset << " got_event: " << pfds[i].fd + << " r:" << ((pfds[i].revents & POLLIN_CHECK) != 0) + << " w:" << ((pfds[i].revents & POLLOUT_CHECK) != 0) << " [" + << pfds[i].revents << "]"; // This is a mitigation to prevent poll() from spinning on a //* POLLHUP https://github.com/grpc/grpc/pull/13665 // diff --git a/deps/grpc/src/core/lib/iomgr/ev_posix.cc b/deps/grpc/src/core/lib/iomgr/ev_posix.cc index e60dd68524..70ee372c4f 100644 --- a/deps/grpc/src/core/lib/iomgr/ev_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/ev_posix.cc @@ -30,7 +30,6 @@ #include "absl/strings/str_split.h" #include -#include #include #include "src/core/lib/config/config_vars.h" @@ -42,18 +41,6 @@ #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/util/useful.h" -// Traces fd create/close operations - -// Polling API trace only enabled in debug builds -#ifndef NDEBUG -#define GRPC_POLLING_API_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(polling_api)) { \ - gpr_log(GPR_INFO, "(polling-api) " format, __VA_ARGS__); \ - } -#else -#define GRPC_POLLING_API_TRACE(...) -#endif // NDEBUG - /// Default poll() function - a pointer so that it can be overridden by some /// tests #ifndef GPR_AIX @@ -104,7 +91,8 @@ static void try_engine(absl::string_view engine) { if (g_vtables[i] != nullptr && is(engine, g_vtables[i]->name) && g_vtables[i]->check_engine_available(engine == g_vtables[i]->name)) { g_event_engine = g_vtables[i]; - VLOG(2) << "Using polling engine: " << g_event_engine->name; + GRPC_TRACE_VLOG(polling_api, 2) + << "Using polling engine: " << g_event_engine->name; return; } } @@ -164,8 +152,10 @@ bool grpc_event_engine_run_in_background(void) { } grpc_fd* grpc_fd_create(int fd, const char* name, bool track_err) { - GRPC_POLLING_API_TRACE("fd_create(%d, %s, %d)", fd, name, track_err); - GRPC_FD_TRACE("fd_create(%d, %s, %d)", fd, name, track_err); + GRPC_TRACE_DLOG(polling_api, INFO) << "(polling-api) fd_create(" << fd << ", " + << name << ", " << track_err << ")"; + GRPC_TRACE_LOG(fd_trace, INFO) << "(fd-trace) fd_create(" << fd << ", " + << name << ", " << track_err << ")"; return g_event_engine->fd_create( fd, name, track_err && grpc_event_engine_can_track_errors()); } @@ -176,22 +166,29 @@ int grpc_fd_wrapped_fd(grpc_fd* fd) { void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, const char* reason) { - GRPC_POLLING_API_TRACE("fd_orphan(%d, %p, %p, %s)", grpc_fd_wrapped_fd(fd), - on_done, release_fd, reason); - GRPC_FD_TRACE("grpc_fd_orphan, fd:%d closed", grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) fd_orphan(" << grpc_fd_wrapped_fd(fd) << ", " << on_done + << ", " << release_fd << ", " << reason << ")"; + GRPC_TRACE_LOG(fd_trace, INFO) + << "(fd-trace) grpc_fd_orphan, fd:" << grpc_fd_wrapped_fd(fd) + << " closed"; g_event_engine->fd_orphan(fd, on_done, release_fd, reason); } void grpc_fd_set_pre_allocated(grpc_fd* fd) { - GRPC_POLLING_API_TRACE("fd_set_pre_allocated(%d)", grpc_fd_wrapped_fd(fd)); - GRPC_FD_TRACE("fd_set_pre_allocated(%d)", grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) fd_set_pre_allocated(" << grpc_fd_wrapped_fd(fd) << ")"; + GRPC_TRACE_LOG(fd_trace, INFO) + << "(fd-trace) fd_set_pre_allocated(" << grpc_fd_wrapped_fd(fd) << ")"; g_event_engine->fd_set_pre_allocated(fd); } void grpc_fd_shutdown(grpc_fd* fd, grpc_error_handle why) { - GRPC_POLLING_API_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd)); - GRPC_FD_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_LOG(polling_api, INFO) + << "(polling-api) fd_shutdown(" << grpc_fd_wrapped_fd(fd) << ")"; + GRPC_TRACE_LOG(fd_trace, INFO) + << "(fd-trace) fd_shutdown(" << grpc_fd_wrapped_fd(fd) << ")"; g_event_engine->fd_shutdown(fd, why); } @@ -220,41 +217,48 @@ void grpc_fd_set_error(grpc_fd* fd) { g_event_engine->fd_set_error(fd); } static size_t pollset_size(void) { return g_event_engine->pollset_size; } static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { - GRPC_POLLING_API_TRACE("pollset_init(%p)", pollset); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_init(" << pollset << ")"; g_event_engine->pollset_init(pollset, mu); } static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { - GRPC_POLLING_API_TRACE("pollset_shutdown(%p)", pollset); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_shutdown(" << pollset << ")"; g_event_engine->pollset_shutdown(pollset, closure); } static void pollset_destroy(grpc_pollset* pollset) { - GRPC_POLLING_API_TRACE("pollset_destroy(%p)", pollset); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_destroy(" << pollset << ")"; g_event_engine->pollset_destroy(pollset); } static grpc_error_handle pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_core::Timestamp deadline) { - GRPC_POLLING_API_TRACE("pollset_work(%p, %" PRId64 ") begin", pollset, - deadline.milliseconds_after_process_epoch()); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_work(" << pollset << ", " + << deadline.milliseconds_after_process_epoch() << ") begin"; grpc_error_handle err = g_event_engine->pollset_work(pollset, worker, deadline); - GRPC_POLLING_API_TRACE("pollset_work(%p, %" PRId64 ") end", pollset, - deadline.milliseconds_after_process_epoch()); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_work(" << pollset << ", " + << deadline.milliseconds_after_process_epoch() << ") end"; return err; } static grpc_error_handle pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { - GRPC_POLLING_API_TRACE("pollset_kick(%p, %p)", pollset, specific_worker); + GRPC_TRACE_DLOG(polling_api, INFO) << "(polling-api) pollset_kick(" << pollset + << ", " << specific_worker << ")"; return g_event_engine->pollset_kick(pollset, specific_worker); } void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd) { - GRPC_POLLING_API_TRACE("pollset_add_fd(%p, %d)", pollset, - grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_add_fd(" << pollset << ", " + << grpc_fd_wrapped_fd(fd) << ")"; g_event_engine->pollset_add_fd(pollset, fd); } @@ -269,38 +273,44 @@ grpc_pollset_vtable grpc_posix_pollset_vtable = { static grpc_pollset_set* pollset_set_create(void) { grpc_pollset_set* pss = g_event_engine->pollset_set_create(); - GRPC_POLLING_API_TRACE("pollset_set_create(%p)", pss); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_create(" << pss << ")"; return pss; } static void pollset_set_destroy(grpc_pollset_set* pollset_set) { - GRPC_POLLING_API_TRACE("pollset_set_destroy(%p)", pollset_set); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_destroy(" << pollset_set << ")"; g_event_engine->pollset_set_destroy(pollset_set); } static void pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - GRPC_POLLING_API_TRACE("pollset_set_add_pollset(%p, %p)", pollset_set, - pollset); + GRPC_TRACE_DLOG(polling_api, INFO) << "(polling-api) pollset_set_add_pollset(" + << pollset_set << ", " << pollset << ")"; g_event_engine->pollset_set_add_pollset(pollset_set, pollset); } static void pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - GRPC_POLLING_API_TRACE("pollset_set_del_pollset(%p, %p)", pollset_set, - pollset); + GRPC_TRACE_DLOG(polling_api, INFO) << "(polling-api) pollset_set_del_pollset(" + << pollset_set << ", " << pollset << ")"; g_event_engine->pollset_set_del_pollset(pollset_set, pollset); } static void pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { - GRPC_POLLING_API_TRACE("pollset_set_add_pollset_set(%p, %p)", bag, item); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_add_pollset_set(" << bag << ", " << item + << ")"; g_event_engine->pollset_set_add_pollset_set(bag, item); } static void pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { - GRPC_POLLING_API_TRACE("pollset_set_del_pollset_set(%p, %p)", bag, item); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_del_pollset_set(" << bag << ", " << item + << ")"; g_event_engine->pollset_set_del_pollset_set(bag, item); } @@ -310,14 +320,16 @@ grpc_pollset_set_vtable grpc_posix_pollset_set_vtable = { pollset_set_add_pollset_set, pollset_set_del_pollset_set}; void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { - GRPC_POLLING_API_TRACE("pollset_set_add_fd(%p, %d)", pollset_set, - grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_add_fd(" << pollset_set << ", " + << grpc_fd_wrapped_fd(fd) << ")"; g_event_engine->pollset_set_add_fd(pollset_set, fd); } void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { - GRPC_POLLING_API_TRACE("pollset_set_del_fd(%p, %d)", pollset_set, - grpc_fd_wrapped_fd(fd)); + GRPC_TRACE_DLOG(polling_api, INFO) + << "(polling-api) pollset_set_del_fd(" << pollset_set << ", " + << grpc_fd_wrapped_fd(fd) << ")"; g_event_engine->pollset_set_del_fd(pollset_set, fd); } diff --git a/deps/grpc/src/core/lib/iomgr/ev_posix.h b/deps/grpc/src/core/lib/iomgr/ev_posix.h index bbacc4813a..8573f0568b 100644 --- a/deps/grpc/src/core/lib/iomgr/ev_posix.h +++ b/deps/grpc/src/core/lib/iomgr/ev_posix.h @@ -33,11 +33,6 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" -#define GRPC_FD_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(fd_trace)) { \ - gpr_log(GPR_INFO, "(fd-trace) " format, __VA_ARGS__); \ - } - typedef struct grpc_fd grpc_fd; typedef struct grpc_event_engine_vtable { diff --git a/deps/grpc/src/core/lib/iomgr/event_engine_shims/closure.cc b/deps/grpc/src/core/lib/iomgr/event_engine_shims/closure.cc index 4e67097b46..8a362210b8 100644 --- a/deps/grpc/src/core/lib/iomgr/event_engine_shims/closure.cc +++ b/deps/grpc/src/core/lib/iomgr/event_engine_shims/closure.cc @@ -14,6 +14,7 @@ #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "absl/functional/any_invocable.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include @@ -34,19 +35,16 @@ void RunEventEngineClosure(grpc_closure* closure, grpc_error_handle error) { grpc_core::ExecCtx exec_ctx; #ifndef NDEBUG closure->scheduled = false; - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, - "EventEngine: running closure %p: created [%s:%d]: %s [%s:%d]", - closure, closure->file_created, closure->line_created, - closure->run ? "run" : "scheduled", closure->file_initiated, - closure->line_initiated); - } + GRPC_TRACE_VLOG(closure, 2) + << "EventEngine: running closure " << closure << ": created [" + << closure->file_created << ":" << closure->line_created + << "]: " << (closure->run ? "run" : "scheduled") << " [" + << closure->file_initiated << ":" << closure->line_initiated << "]"; #endif closure->cb(closure->cb_arg, error); #ifndef NDEBUG - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "EventEngine: closure %p finished", closure); - } + GRPC_TRACE_VLOG(closure, 2) + << "EventEngine: closure " << closure << " finished"; #endif } diff --git a/deps/grpc/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/deps/grpc/src/core/lib/iomgr/event_engine_shims/endpoint.cc index f83db8ea87..08fcbc6199 100644 --- a/deps/grpc/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/deps/grpc/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -28,16 +28,14 @@ #include #include #include -#include #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/extensions/can_track_errors.h" #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -121,8 +119,7 @@ class EventEngineEndpointWrapper { read_buffer->~SliceBuffer(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { size_t i; - gpr_log(GPR_INFO, "TCP: %p READ error=%s", eeep_->wrapper, - status.ToString().c_str()); + LOG(INFO) << "TCP: " << eeep_->wrapper << " READ error=" << status; if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < pending_read_buffer_->count; i++) { char* dump = grpc_dump_slice(pending_read_buffer_->slices[i], @@ -152,8 +149,7 @@ class EventEngineEndpointWrapper { Ref(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { size_t i; - gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s)", this, - std::string(PeerAddress()).c_str()); + LOG(INFO) << "TCP: " << this << " WRITE (peer=" << PeerAddress() << ")"; if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < slices->count; i++) { char* dump = @@ -177,10 +173,9 @@ class EventEngineEndpointWrapper { void FinishPendingWrite(absl::Status status) { auto* write_buffer = reinterpret_cast(&eeep_->write_buffer); write_buffer->~SliceBuffer(); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s) error=%s", this, - std::string(PeerAddress()).c_str(), status.ToString().c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "TCP: " << this << " WRITE (peer=" << PeerAddress() + << ") error=" << status; grpc_closure* cb = pending_write_cb_; pending_write_cb_ = nullptr; if (grpc_core::ExecCtx::Get() == nullptr) { @@ -353,7 +348,8 @@ void EndpointDestroy(grpc_endpoint* ep) { auto* eeep = reinterpret_cast( ep); - GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Destroy", eeep->wrapper); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Endpoint::" << eeep->wrapper << " EndpointDestroy"; eeep->wrapper->TriggerShutdown(nullptr); eeep->wrapper->Unref(); } @@ -411,7 +407,8 @@ EventEngineEndpointWrapper::EventEngineEndpointWrapper( } else { fd_ = -1; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Create", eeep_->wrapper); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Endpoint " << eeep_->wrapper << " Create"; } } // namespace diff --git a/deps/grpc/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/deps/grpc/src/core/lib/iomgr/event_engine_shims/tcp_client.cc index 640b3efb28..2880415e19 100644 --- a/deps/grpc/src/core/lib/iomgr/event_engine_shims/tcp_client.cc +++ b/deps/grpc/src/core/lib/iomgr/event_engine_shims/tcp_client.cc @@ -15,17 +15,15 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/string_view.h" #include #include #include #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/resolved_address_internal.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -64,8 +62,8 @@ int64_t event_engine_tcp_client_connect( } else { *endpoint = nullptr; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::Connect Status: %s", - ep.status().ToString().c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Connect Status: " << ep.status(); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_connect, absl_status_to_grpc_error(conn_status)); }, @@ -75,15 +73,14 @@ int64_t event_engine_tcp_client_connect( : grpc_event_engine::experimental::MemoryAllocator(), std::max(grpc_core::Duration::Milliseconds(1), deadline - grpc_core::Timestamp::Now())); - GRPC_EVENT_ENGINE_TRACE("EventEngine::Connect Peer: %s, handle: %" PRId64, - (*addr_uri).c_str(), - static_cast(handle.keys[0])); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Connect Peer: " << *addr_uri << ", handle: " << handle; return handle.keys[0]; } bool event_engine_tcp_client_cancel_connect(int64_t connection_handle) { - GRPC_EVENT_ENGINE_TRACE("EventEngine::CancelConnect handle: %" PRId64, - connection_handle); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::CancelConnect handle: " << connection_handle; return GetDefaultEventEngine()->CancelConnect( {static_cast(connection_handle), 0}); } diff --git a/deps/grpc/src/core/lib/iomgr/exec_ctx.cc b/deps/grpc/src/core/lib/iomgr/exec_ctx.cc index aa7350b454..804ae6f649 100644 --- a/deps/grpc/src/core/lib/iomgr/exec_ctx.cc +++ b/deps/grpc/src/core/lib/iomgr/exec_ctx.cc @@ -19,9 +19,9 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include #include #include @@ -32,21 +32,18 @@ static void exec_ctx_run(grpc_closure* closure) { #ifndef NDEBUG closure->scheduled = false; - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "running closure %p: created [%s:%d]: %s [%s:%d]", - closure, closure->file_created, closure->line_created, - closure->run ? "run" : "scheduled", closure->file_initiated, - closure->line_initiated); - } + GRPC_TRACE_VLOG(closure, 2) + << "running closure " << closure << ": created [" << closure->file_created + << ":" << closure->line_created + << "]: " << (closure->run ? "run" : "scheduled") << " [" + << closure->file_initiated << ":" << closure->line_initiated << "]"; #endif grpc_error_handle error = grpc_core::internal::StatusMoveFromHeapPtr(closure->error_data.error); closure->error_data.error = 0; closure->cb(closure->cb_arg, std::move(error)); #ifndef NDEBUG - if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "closure %p finished", closure); - } + GRPC_TRACE_VLOG(closure, 2) << "closure " << closure << " finished"; #endif } diff --git a/deps/grpc/src/core/lib/iomgr/exec_ctx.h b/deps/grpc/src/core/lib/iomgr/exec_ctx.h index 68340c7df1..bcdb1a743d 100644 --- a/deps/grpc/src/core/lib/iomgr/exec_ctx.h +++ b/deps/grpc/src/core/lib/iomgr/exec_ctx.h @@ -33,14 +33,15 @@ #include #include #include -#include #include +#include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/fork.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/util/latent_see.h" #include "src/core/util/time_precise.h" #if !defined(_WIN32) || !defined(_DLL) @@ -109,17 +110,33 @@ class Combiner; /// since that implies a core re-entry outside of application /// callbacks. /// -class GRPC_DLL ExecCtx { +class GRPC_DLL ExecCtx : public latent_see::ParentScope { public: /// Default Constructor - ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { + ExecCtx() + : latent_see::ParentScope(GRPC_LATENT_SEE_METADATA("ExecCtx")), + flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { +#if !TARGET_OS_IPHONE + if (!IsTimeCachingInPartyEnabled()) { + time_cache_.emplace(); + } +#endif Fork::IncExecCtxCount(); Set(this); } /// Parameterised Constructor - explicit ExecCtx(uintptr_t fl) : flags_(fl) { + explicit ExecCtx(uintptr_t fl) + : ExecCtx(fl, GRPC_LATENT_SEE_METADATA("ExecCtx")) {} + + explicit ExecCtx(uintptr_t fl, latent_see::Metadata* latent_see_metadata) + : latent_see::ParentScope(latent_see_metadata), flags_(fl) { +#if !TARGET_OS_IPHONE + if (!IsTimeCachingInPartyEnabled()) { + time_cache_.emplace(); + } +#endif if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) { Fork::IncExecCtxCount(); } @@ -189,23 +206,18 @@ class GRPC_DLL ExecCtx { Timestamp Now() { return Timestamp::Now(); } void InvalidateNow() { -#if !TARGET_OS_IPHONE - time_cache_.InvalidateCache(); -#endif + if (time_cache_.has_value()) time_cache_->InvalidateCache(); } void SetNowIomgrShutdown() { -#if !TARGET_OS_IPHONE // We get to do a test only set now on this path just because iomgr // is getting removed and no point adding more interfaces for it. - time_cache_.TestOnlySetNow(Timestamp::InfFuture()); -#endif + TestOnlySetNow(Timestamp::InfFuture()); } void TestOnlySetNow(Timestamp now) { -#if !TARGET_OS_IPHONE - time_cache_.TestOnlySetNow(now); -#endif + if (!time_cache_.has_value()) time_cache_.emplace(); + time_cache_->TestOnlySetNow(now); } /// Gets pointer to current exec_ctx. @@ -231,9 +243,7 @@ class GRPC_DLL ExecCtx { CombinerData combiner_data_ = {nullptr, nullptr}; uintptr_t flags_; -#if !TARGET_OS_IPHONE - ScopedTimeCache time_cache_; -#endif + absl::optional time_cache_; #if !defined(_WIN32) || !defined(_DLL) static thread_local ExecCtx* exec_ctx_; diff --git a/deps/grpc/src/core/lib/iomgr/executor.cc b/deps/grpc/src/core/lib/iomgr/executor.cc index ef6d01b1d6..02f21cf796 100644 --- a/deps/grpc/src/core/lib/iomgr/executor.cc +++ b/deps/grpc/src/core/lib/iomgr/executor.cc @@ -21,13 +21,15 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include #include -#include #include #include +#include "src/core/lib/debug/trace_impl.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -36,13 +38,6 @@ #define MAX_DEPTH 2 -#define EXECUTOR_TRACE(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(executor)) { \ - gpr_log(GPR_INFO, "EXECUTOR " format, __VA_ARGS__); \ - } \ - } while (0) - namespace grpc_core { namespace { @@ -107,11 +102,13 @@ size_t Executor::RunClosures(const char* executor_name, while (c != nullptr) { grpc_closure* next = c->next_data.next; #ifndef NDEBUG - EXECUTOR_TRACE("(%s) run %p [created by %s:%d]", executor_name, c, - c->file_created, c->line_created); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << executor_name << ") run " << c << " [created by " + << c->file_created << ":" << c->line_created << "]"; c->scheduled = false; #else - EXECUTOR_TRACE("(%s) run %p", executor_name, c); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << executor_name << ") run " << c; #endif grpc_error_handle error = internal::StatusMoveFromHeapPtr(c->error_data.error); @@ -131,11 +128,14 @@ bool Executor::IsThreaded() const { void Executor::SetThreading(bool threading) { gpr_atm curr_num_threads = gpr_atm_acq_load(&num_threads_); - EXECUTOR_TRACE("(%s) SetThreading(%d) begin", name_, threading); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") SetThreading(" << threading << ") begin"; if (threading) { if (curr_num_threads > 0) { - EXECUTOR_TRACE("(%s) SetThreading(true). curr_num_threads > 0", name_); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ + << ") SetThreading(true). curr_num_threads > 0"; return; } @@ -157,7 +157,9 @@ void Executor::SetThreading(bool threading) { thd_state_[0].thd.Start(); } else { // !threading if (curr_num_threads == 0) { - EXECUTOR_TRACE("(%s) SetThreading(false). curr_num_threads == 0", name_); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ + << ") SetThreading(false). curr_num_threads == 0"; return; } @@ -176,8 +178,9 @@ void Executor::SetThreading(bool threading) { curr_num_threads = gpr_atm_no_barrier_load(&num_threads_); for (gpr_atm i = 0; i < curr_num_threads; i++) { thd_state_[i].thd.Join(); - EXECUTOR_TRACE("(%s) Thread %" PRIdPTR " of %" PRIdPTR " joined", name_, - i + 1, curr_num_threads); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") Thread " << i + 1 << " of " + << curr_num_threads << " joined"; } gpr_atm_rel_store(&num_threads_, 0); @@ -198,7 +201,8 @@ void Executor::SetThreading(bool threading) { grpc_iomgr_platform_shutdown_background_closure(); } - EXECUTOR_TRACE("(%s) SetThreading(%d) done", name_, threading); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") SetThreading(" << threading << ") done"; } void Executor::Shutdown() { SetThreading(false); } @@ -211,8 +215,9 @@ void Executor::ThreadMain(void* arg) { size_t subtract_depth = 0; for (;;) { - EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: step (sub_depth=%" PRIdPTR ")", - ts->name, ts->id, subtract_depth); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << ts->name << ") [" << ts->id + << "]: step (sub_depth=" << subtract_depth << ")"; gpr_mu_lock(&ts->mu); ts->depth -= subtract_depth; @@ -223,7 +228,8 @@ void Executor::ThreadMain(void* arg) { } if (ts->shutdown) { - EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: shutdown", ts->name, ts->id); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << ts->name << ") [" << ts->id << "]: shutdown"; gpr_mu_unlock(&ts->mu); break; } @@ -232,7 +238,8 @@ void Executor::ThreadMain(void* arg) { ts->elems = GRPC_CLOSURE_LIST_INIT; gpr_mu_unlock(&ts->mu); - EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: execute", ts->name, ts->id); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << ts->name << ") [" << ts->id << "]: execute"; ExecCtx::Get()->InvalidateNow(); subtract_depth = RunClosures(ts->name, closures); @@ -254,10 +261,13 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error, // or already shutdown), then queue the closure on the exec context itself if (cur_thread_count == 0) { #ifndef NDEBUG - EXECUTOR_TRACE("(%s) schedule %p (created %s:%d) inline", name_, closure, - closure->file_created, closure->line_created); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") schedule " << closure << " (created " + << closure->file_created << ":" << closure->line_created + << ") inline"; #else - EXECUTOR_TRACE("(%s) schedule %p inline", name_, closure); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") schedule " << closure << " inline"; #endif grpc_closure_list_append(ExecCtx::Get()->closure_list(), closure, error); return; @@ -277,14 +287,15 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error, for (;;) { #ifndef NDEBUG - EXECUTOR_TRACE( - "(%s) try to schedule %p (%s) (created %s:%d) to thread " - "%" PRIdPTR, - name_, closure, is_short ? "short" : "long", closure->file_created, - closure->line_created, ts->id); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") try to schedule " << closure << " (" + << (is_short ? "short" : "long") << ") (created " + << closure->file_created << ":" << closure->line_created + << ") to thread " << ts->id; #else - EXECUTOR_TRACE("(%s) try to schedule %p (%s) to thread %" PRIdPTR, name_, - closure, is_short ? "short" : "long", ts->id); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR (" << name_ << ") try to schedule " << closure << " (" + << (is_short ? "short" : "long") << ") to thread " << ts->id; #endif gpr_mu_lock(&ts->mu); @@ -426,7 +437,8 @@ bool Executor::IsThreadedDefault() { } void Executor::SetThreadingAll(bool enable) { - EXECUTOR_TRACE("Executor::SetThreadingAll(%d) called", enable); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR Executor::SetThreadingAll(" << enable << ") called"; for (size_t i = 0; i < static_cast(ExecutorType::NUM_EXECUTORS); i++) { executors[i]->SetThreading(enable); @@ -434,7 +446,8 @@ void Executor::SetThreadingAll(bool enable) { } void Executor::SetThreadingDefault(bool enable) { - EXECUTOR_TRACE("Executor::SetThreadingDefault(%d) called", enable); + GRPC_TRACE_LOG(executor, INFO) + << "EXECUTOR Executor::SetThreadingDefault(" << enable << ") called"; executors[static_cast(ExecutorType::DEFAULT)]->SetThreading(enable); } diff --git a/deps/grpc/src/core/lib/iomgr/fork_windows.cc b/deps/grpc/src/core/lib/iomgr/fork_windows.cc index 0e1583173d..84d0609e2a 100644 --- a/deps/grpc/src/core/lib/iomgr/fork_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/fork_windows.cc @@ -25,7 +25,6 @@ #include "absl/log/log.h" #include -#include // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/deps/grpc/src/core/lib/iomgr/internal_errqueue.cc b/deps/grpc/src/core/lib/iomgr/internal_errqueue.cc index 5223687a43..dbf001b4cc 100644 --- a/deps/grpc/src/core/lib/iomgr/internal_errqueue.cc +++ b/deps/grpc/src/core/lib/iomgr/internal_errqueue.cc @@ -16,7 +16,6 @@ #include "absl/log/log.h" -#include #include #include "src/core/lib/iomgr/port.h" diff --git a/deps/grpc/src/core/lib/iomgr/iocp_windows.cc b/deps/grpc/src/core/lib/iomgr/iocp_windows.cc index 9d6477aaaa..bc931a4f44 100644 --- a/deps/grpc/src/core/lib/iomgr/iocp_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/iocp_windows.cc @@ -30,7 +30,6 @@ #include "absl/log/log.h" #include -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/iomgr_windows.cc b/deps/grpc/src/core/lib/iomgr/iomgr_windows.cc index 21570d9033..ae35534186 100644 --- a/deps/grpc/src/core/lib/iomgr/iomgr_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/iomgr_windows.cc @@ -24,8 +24,6 @@ #include "absl/log/check.h" -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" diff --git a/deps/grpc/src/core/lib/iomgr/lockfree_event.cc b/deps/grpc/src/core/lib/iomgr/lockfree_event.cc index 7b20767870..51e46ab976 100644 --- a/deps/grpc/src/core/lib/iomgr/lockfree_event.cc +++ b/deps/grpc/src/core/lib/iomgr/lockfree_event.cc @@ -19,8 +19,8 @@ #include "src/core/lib/iomgr/lockfree_event.h" #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -95,11 +95,8 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { // sure that the shutdown error has been initialized properly before us // referencing it. gpr_atm curr = gpr_atm_acq_load(&state_); - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, - "LockfreeEvent::NotifyOn: %p curr=%" PRIxPTR " closure=%p", this, - curr, closure); - } + GRPC_TRACE_VLOG(polling, 2) << "LockfreeEvent::NotifyOn: " << this + << " curr=" << curr << " closure=" << closure; switch (curr) { case kClosureNotReady: { // kClosureNotReady -> . @@ -164,11 +161,9 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, - "LockfreeEvent::SetShutdown: %p curr=%" PRIxPTR " err=%s", - &state_, curr, StatusToString(shutdown_error).c_str()); - } + GRPC_TRACE_VLOG(polling, 2) + << "LockfreeEvent::SetShutdown: " << &state_ << " curr=" << curr + << " err=" << StatusToString(shutdown_error); switch (curr) { case kClosureReady: case kClosureNotReady: @@ -214,10 +209,8 @@ void LockfreeEvent::SetReady() { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); - if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, "LockfreeEvent::SetReady: %p curr=%" PRIxPTR, &state_, - curr); - } + GRPC_TRACE_VLOG(polling, 2) + << "LockfreeEvent::SetReady: " << &state_ << " curr=" << curr; switch (curr) { case kClosureReady: { diff --git a/deps/grpc/src/core/lib/iomgr/polling_entity.cc b/deps/grpc/src/core/lib/iomgr/polling_entity.cc index 42233112c1..2a3e9c7706 100644 --- a/deps/grpc/src/core/lib/iomgr/polling_entity.cc +++ b/deps/grpc/src/core/lib/iomgr/polling_entity.cc @@ -22,7 +22,6 @@ #include "absl/strings/str_format.h" #include -#include #include #include "src/core/lib/gprpp/crash.h" @@ -30,8 +29,12 @@ grpc_polling_entity grpc_polling_entity_create_from_pollset_set( grpc_pollset_set* pollset_set) { grpc_polling_entity pollent; - pollent.pollent.pollset_set = pollset_set; - pollent.tag = GRPC_POLLS_POLLSET_SET; + if (pollset_set == nullptr) { + pollent.tag = GRPC_POLLS_NONE; + } else { + pollent.pollent.pollset_set = pollset_set; + pollent.tag = GRPC_POLLS_POLLSET_SET; + } return pollent; } @@ -73,6 +76,8 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { CHECK_NE(pollent->pollent.pollset_set, nullptr); grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set); + } else if (pollent->tag == GRPC_POLLS_NONE) { + // Do nothing. } else { grpc_core::Crash( absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag)); @@ -93,6 +98,8 @@ void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { CHECK_NE(pollent->pollent.pollset_set, nullptr); grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set); + } else if (pollent->tag == GRPC_POLLS_NONE) { + // Do nothing. } else { grpc_core::Crash( absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag)); diff --git a/deps/grpc/src/core/lib/iomgr/pollset_windows.cc b/deps/grpc/src/core/lib/iomgr/pollset_windows.cc index c42d83da49..32925c61a9 100644 --- a/deps/grpc/src/core/lib/iomgr/pollset_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/pollset_windows.cc @@ -22,8 +22,6 @@ #ifdef GRPC_WINSOCK_SOCKET -#include - #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" diff --git a/deps/grpc/src/core/lib/iomgr/resolve_address.cc b/deps/grpc/src/core/lib/iomgr/resolve_address.cc index 24cdcf1c6d..db7b891bcc 100644 --- a/deps/grpc/src/core/lib/iomgr/resolve_address.cc +++ b/deps/grpc/src/core/lib/iomgr/resolve_address.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc b/deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc index 8cad6517c1..f890a349b9 100644 --- a/deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/resolve_address_posix.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc b/deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc index 054f742381..105dcc8574 100644 --- a/deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/resolve_address_windows.cc @@ -28,7 +28,6 @@ #include "absl/strings/str_format.h" #include -#include #include #include #include diff --git a/deps/grpc/src/core/lib/iomgr/sockaddr_utils_posix.cc b/deps/grpc/src/core/lib/iomgr/sockaddr_utils_posix.cc index d1981a4319..62d5bcac84 100644 --- a/deps/grpc/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -40,7 +40,6 @@ #include "absl/log/check.h" #include -#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/socket_mutator.cc b/deps/grpc/src/core/lib/iomgr/socket_mutator.cc index 428cc0bdf3..f77661969c 100644 --- a/deps/grpc/src/core/lib/iomgr/socket_mutator.cc +++ b/deps/grpc/src/core/lib/iomgr/socket_mutator.cc @@ -19,7 +19,6 @@ #include "src/core/lib/iomgr/socket_mutator.h" #include -#include #include #include diff --git a/deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc b/deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc index aceb1a0621..19c6ccab15 100644 --- a/deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -49,7 +49,6 @@ #include #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -391,13 +390,13 @@ grpc_error_handle grpc_set_socket_tcp_user_timeout( << " ms"; if (0 != setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &timeout, sizeof(timeout))) { - gpr_log(GPR_ERROR, "setsockopt(TCP_USER_TIMEOUT) %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "setsockopt(TCP_USER_TIMEOUT) " + << grpc_core::StrError(errno); return absl::OkStatus(); } if (0 != getsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) { - gpr_log(GPR_ERROR, "getsockopt(TCP_USER_TIMEOUT) %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "getsockopt(TCP_USER_TIMEOUT) " + << grpc_core::StrError(errno); return absl::OkStatus(); } if (newval != timeout) { @@ -481,14 +480,15 @@ static int create_socket(grpc_socket_factory* factory, int domain, int type, : socket(domain, type, protocol); if (res < 0 && errno == EMFILE) { int saved_errno = errno; - GRPC_LOG_EVERY_N_SEC( - 10, GPR_ERROR, - "socket(%d, %d, %d) returned %d with error: |%s|. This process " - "might not have a sufficient file descriptor limit for the number " - "of connections grpc wants to open (which is generally a function of " - "the number of grpc channels, the lb policy of each channel, and the " - "number of backends each channel is load balancing across).", - domain, type, protocol, res, grpc_core::StrError(errno).c_str()); + LOG_EVERY_N_SEC(ERROR, 10) + << "socket(" << domain << ", " << type << ", " << protocol + << ") returned " << res << " with error: |" + << grpc_core::StrError(errno) + << "|. This process might not have a sufficient file descriptor limit " + "for the number of connections grpc wants to open (which is " + "generally a function of the number of grpc channels, the lb policy " + "of each channel, and the number of backends each channel is load " + "balancing across)."; errno = saved_errno; } return res; diff --git a/deps/grpc/src/core/lib/iomgr/socket_utils_linux.cc b/deps/grpc/src/core/lib/iomgr/socket_utils_linux.cc index 2e64c21e0b..d699a1d5fe 100644 --- a/deps/grpc/src/core/lib/iomgr/socket_utils_linux.cc +++ b/deps/grpc/src/core/lib/iomgr/socket_utils_linux.cc @@ -25,8 +25,6 @@ #include #include -#include - #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" diff --git a/deps/grpc/src/core/lib/iomgr/socket_utils_posix.cc b/deps/grpc/src/core/lib/iomgr/socket_utils_posix.cc index b34f3749c7..88b5d9a6bc 100644 --- a/deps/grpc/src/core/lib/iomgr/socket_utils_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/socket_utils_posix.cc @@ -28,7 +28,6 @@ #include #include -#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc b/deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc index 8b0e8f45f7..195a838598 100644 --- a/deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc @@ -22,8 +22,6 @@ #ifdef GRPC_WINDOWS_SOCKETUTILS -#include - #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/deps/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc b/deps/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc index f350703e4c..f3228ad20c 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -27,9 +27,10 @@ #include #include +#include "absl/log/log.h" + #include #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -77,10 +78,8 @@ static void CFStreamConnectCleanup(CFStreamConnect* connect) { static void OnAlarm(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast(arg); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnAlarm, error:%s", connect, - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT :" << connect << " OnAlarm, error:" + << grpc_core::StatusToString(error); gpr_mu_lock(&connect->mu); grpc_closure* closure = connect->closure; connect->closure = nil; @@ -98,10 +97,8 @@ static void OnAlarm(void* arg, grpc_error_handle error) { static void OnOpen(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast(arg); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnOpen, error:%s", connect, - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT :" << connect << " OnOpen, error:" + << grpc_core::StatusToString(error); gpr_mu_lock(&connect->mu); grpc_timer_cancel(&connect->alarm); grpc_closure* closure = connect->closure; @@ -172,10 +169,9 @@ static int64_t CFStreamClientConnect( gpr_ref_init(&connect->refcount, 1); gpr_mu_init(&connect->mu); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %p, %s: asynchronously connecting", - connect, connect->addr_name.c_str()); - } + GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT: " << connect << ", " + << connect->addr_name + << ": asynchronously connecting"; CFReadStreamRef read_stream; CFWriteStreamRef write_stream; diff --git a/deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc b/deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc index eed6762c44..b0d983df9b 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc @@ -34,7 +34,6 @@ #include "absl/strings/str_cat.h" #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -142,10 +141,9 @@ static grpc_error_handle prepare_socket( static void tc_on_alarm(void* acp, grpc_error_handle error) { int done; async_connect* ac = static_cast(acp); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_alarm: error=%s", - ac->addr_str.c_str(), grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "CLIENT_CONNECT: " << ac->addr_str + << ": on_alarm: error=" << grpc_core::StatusToString(error); gpr_mu_lock(&ac->mu); if (ac->fd != nullptr) { grpc_fd_shutdown(ac->fd, GRPC_ERROR_CREATE("connect() timed out")); @@ -181,10 +179,9 @@ static void on_writable(void* acp, grpc_error_handle error) { std::string addr_str = ac->addr_str; grpc_fd* fd; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_writable: error=%s", - ac->addr_str.c_str(), grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "CLIENT_CONNECT: " << ac->addr_str + << ": on_writable: error=" << grpc_core::StatusToString(error); gpr_mu_lock(&ac->mu); CHECK(ac->fd); @@ -382,10 +379,8 @@ int64_t grpc_tcp_client_create_from_prepared_fd( grpc_schedule_on_exec_ctx); ac->options = options; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: asynchronously connecting fd %p", - ac->addr_str.c_str(), fdobj); - } + GRPC_TRACE_LOG(tcp, INFO) << "CLIENT_CONNECT: " << ac->addr_str + << ": asynchronously connecting fd " << fdobj; int shard_number = connection_id % (*g_connection_shards).size(); struct ConnectionShard* shard = &(*g_connection_shards)[shard_number]; diff --git a/deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc b/deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc index bedf1cca5b..4086d45a57 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/deps/grpc/src/core/lib/iomgr/tcp_posix.cc b/deps/grpc/src/core/lib/iomgr/tcp_posix.cc index a58d542023..37e409d123 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_posix.cc @@ -50,7 +50,6 @@ #include #include -#include #include #include #include @@ -594,9 +593,9 @@ void LogCommonIOErrors(absl::string_view prefix, int error_no) { return; default: grpc_core::global_stats().IncrementUncommonIoErrorCount(); - GRPC_LOG_EVERY_N_SEC(1, GPR_ERROR, "%s encountered uncommon error: %s", - prefix.data(), - grpc_core::StrError(error_no).c_str()); + LOG_EVERY_N_SEC(ERROR, 1) + << prefix.data() + << " encountered uncommon error: " << grpc_core::StrError(error_no); return; } } @@ -619,18 +618,14 @@ static void tcp_drop_uncovered_then_handle_write(void* arg /* grpc_tcp */, static void done_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast(bp); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p destroy", p); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " destroy"; grpc_pollset_destroy(BACKUP_POLLER_POLLSET(p)); gpr_free(p); } static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast(bp); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p run", p); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " run"; gpr_mu_lock(p->pollset_mu); grpc_core::Timestamp deadline = grpc_core::Timestamp::Now() + grpc_core::Duration::Seconds(10); @@ -645,17 +640,13 @@ static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { g_backup_poller = nullptr; g_uncovered_notifications_pending = 0; g_backup_poller_mu->Unlock(); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p shutdown", p); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " shutdown"; grpc_pollset_shutdown(BACKUP_POLLER_POLLSET(p), GRPC_CLOSURE_INIT(&p->run_poller, done_poller, p, grpc_schedule_on_exec_ctx)); } else { g_backup_poller_mu->Unlock(); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p reschedule", p); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " reschedule"; grpc_core::Executor::Run(&p->run_poller, absl::OkStatus(), grpc_core::ExecutorType::DEFAULT, grpc_core::ExecutorJobType::LONG); @@ -670,10 +661,8 @@ static void drop_uncovered(grpc_tcp* /*tcp*/) { old_count = g_uncovered_notifications_pending--; g_backup_poller_mu->Unlock(); CHECK_GT(old_count, 1); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p uncover cnt %d->%d", p, old_count, - old_count - 1); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " uncover cnt " + << old_count << "->" << old_count - 1; } // gRPC API considers a Write operation to be done the moment it clears ‘flow @@ -694,9 +683,7 @@ static void cover_self(grpc_tcp* tcp) { g_backup_poller = p; grpc_pollset_init(BACKUP_POLLER_POLLSET(p), &p->pollset_mu); g_backup_poller_mu->Unlock(); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p create", p); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " create"; grpc_core::Executor::Run( GRPC_CLOSURE_INIT(&p->run_poller, run_poller, p, nullptr), absl::OkStatus(), grpc_core::ExecutorType::DEFAULT, @@ -706,24 +693,18 @@ static void cover_self(grpc_tcp* tcp) { p = g_backup_poller; g_backup_poller_mu->Unlock(); } - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p add %p cnt %d->%d", p, tcp, - old_count - 1, old_count); - } + GRPC_TRACE_LOG(tcp, INFO) << "BACKUP_POLLER:" << p << " add " << tcp + << " cnt " << old_count - 1 << "->" << old_count; grpc_pollset_add_fd(BACKUP_POLLER_POLLSET(p), tcp->em_fd); } static void notify_on_read(grpc_tcp* tcp) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p notify_on_read", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " notify_on_read"; grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_done_closure); } static void notify_on_write(grpc_tcp* tcp) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p notify_on_write", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " notify_on_write"; if (!grpc_event_engine_run_in_background()) { cover_self(tcp); } @@ -732,10 +713,8 @@ static void notify_on_write(grpc_tcp* tcp) { static void tcp_drop_uncovered_then_handle_write(void* arg, grpc_error_handle error) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_write: %s", arg, - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "TCP:" << arg << " got_write: " << grpc_core::StatusToString(error); drop_uncovered(static_cast(arg)); tcp_handle_write(arg, error); } @@ -822,9 +801,8 @@ static void tcp_destroy(grpc_endpoint* ep) { static void perform_reclamation(grpc_tcp* tcp) ABSL_LOCKS_EXCLUDED(tcp->read_mu) { - if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - LOG(INFO) << "TCP: benign reclamation to free memory"; - } + GRPC_TRACE_LOG(resource_quota, INFO) + << "TCP: benign reclamation to free memory"; tcp->read_mu.Lock(); if (tcp->incoming_buffer != nullptr) { grpc_slice_buffer_reset_and_unref(tcp->incoming_buffer); @@ -853,10 +831,11 @@ static void tcp_trace_read(grpc_tcp* tcp, grpc_error_handle error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(tcp->read_mu) { grpc_closure* cb = tcp->read_cb; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); + LOG(INFO) << "TCP:" << tcp << " call_cb " << cb << " " << cb->cb << ":" + << cb->cb_arg; size_t i; - gpr_log(GPR_INFO, "READ %p (peer=%s) error=%s", tcp, - tcp->peer_string.c_str(), grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "READ " << tcp << " (peer=" << tcp->peer_string + << ") error=" << grpc_core::StatusToString(error); if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < tcp->incoming_buffer->count; i++) { char* dump = grpc_dump_slice(tcp->incoming_buffer->slices[i], @@ -904,10 +883,8 @@ static void update_rcvlowat(grpc_tcp* tcp) } if (setsockopt(tcp->fd, SOL_SOCKET, SO_RCVLOWAT, &remaining, sizeof(remaining)) != 0) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat("Cannot set SO_RCVLOWAT on fd=", tcp->fd, - " err=", grpc_core::StrError(errno).c_str()) - .c_str()); + LOG(ERROR) << "Cannot set SO_RCVLOWAT on fd=" << tcp->fd + << " err=" << grpc_core::StrError(errno); return; } tcp->set_rcvlowat = remaining; @@ -917,9 +894,8 @@ static void update_rcvlowat(grpc_tcp* tcp) #define MAX_READ_IOVEC 64 static bool tcp_do_read(grpc_tcp* tcp, grpc_error_handle* error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(tcp->read_mu) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p do_read", tcp); - } + GRPC_LATENT_SEE_INNER_SCOPE("tcp_do_read"); + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " do_read"; struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -1130,10 +1106,8 @@ static void maybe_make_read_slices(grpc_tcp* tcp) static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error_handle error) { grpc_tcp* tcp = static_cast(arg); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_read: %s", tcp, - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "TCP:" << tcp << " got_read: " << grpc_core::StatusToString(error); tcp->read_mu.Lock(); grpc_error_handle tcp_read_error; if (GPR_LIKELY(error.ok()) && tcp->memory_owner.is_valid()) { @@ -1213,6 +1187,7 @@ static void tcp_read(grpc_endpoint* ep, grpc_slice_buffer* incoming_buffer, // of bytes sent. ssize_t tcp_send(int fd, const struct msghdr* msg, int* saved_errno, int additional_flags = 0) { + GRPC_LATENT_SEE_INNER_SCOPE("tcp_send"); ssize_t sent_length; do { // TODO(klempner): Cork if this is a partial write @@ -1280,9 +1255,8 @@ static bool tcp_write_with_timestamps(grpc_tcp* tcp, struct msghdr* msg, uint32_t opt = grpc_core::kTimestampingSocketOptions; if (setsockopt(tcp->fd, SOL_SOCKET, SO_TIMESTAMPING, static_cast(&opt), sizeof(opt)) != 0) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(ERROR) << "Failed to set timestamping options on the socket."; - } + GRPC_TRACE_LOG(tcp, ERROR) + << "Failed to set timestamping options on the socket."; return false; } tcp->bytes_counter = -1; @@ -1366,9 +1340,7 @@ struct cmsghdr* process_timestamp(grpc_tcp* tcp, msghdr* msg, auto next_cmsg = CMSG_NXTHDR(msg, cmsg); cmsghdr* opt_stats = nullptr; if (next_cmsg == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(ERROR) << "Received timestamp without extended error"; - } + GRPC_TRACE_LOG(tcp, ERROR) << "Received timestamp without extended error"; return cmsg; } @@ -1378,9 +1350,7 @@ struct cmsghdr* process_timestamp(grpc_tcp* tcp, msghdr* msg, opt_stats = next_cmsg; next_cmsg = CMSG_NXTHDR(msg, opt_stats); if (next_cmsg == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(ERROR) << "Received timestamp without extended error"; - } + GRPC_TRACE_LOG(tcp, ERROR) << "Received timestamp without extended error"; return opt_stats; } } @@ -1388,9 +1358,7 @@ struct cmsghdr* process_timestamp(grpc_tcp* tcp, msghdr* msg, if (!(next_cmsg->cmsg_level == SOL_IP || next_cmsg->cmsg_level == SOL_IPV6) || !(next_cmsg->cmsg_type == IP_RECVERR || next_cmsg->cmsg_type == IPV6_RECVERR)) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(ERROR) << "Unexpected control message"; - } + GRPC_TRACE_LOG(tcp, ERROR) << "Unexpected control message"; return cmsg; } @@ -1410,6 +1378,7 @@ struct cmsghdr* process_timestamp(grpc_tcp* tcp, msghdr* msg, /// messages from the queue. /// static bool process_errors(grpc_tcp* tcp) { + GRPC_LATENT_SEE_INNER_SCOPE("process_errors"); bool processed_err = false; struct iovec iov; iov.iov_base = nullptr; @@ -1471,11 +1440,9 @@ static bool process_errors(grpc_tcp* tcp) { } else { // Got a control message that is not a timestamp or zerocopy. Don't know // how to handle this. - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, - "unknown control message cmsg_level:%d cmsg_type:%d", - cmsg->cmsg_level, cmsg->cmsg_type); - } + GRPC_TRACE_LOG(tcp, INFO) + << "unknown control message cmsg_level:" << cmsg->cmsg_level + << " cmsg_type:" << cmsg->cmsg_type; return processed_err; } } @@ -1488,10 +1455,7 @@ static bool process_errors(grpc_tcp* tcp) { static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error_handle error) { grpc_tcp* tcp = static_cast(arg); - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_error: %s", tcp, - grpc_core::StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " got_error: " << error; if (!error.ok() || static_cast(gpr_atm_acq_load(&tcp->stop_error_notification))) { @@ -1819,9 +1783,7 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, ? tcp_flush_zerocopy(tcp, tcp->current_zerocopy_send, &error) : tcp_flush(tcp, &error); if (!flush_result) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(INFO) << "write: delayed"; - } + GRPC_TRACE_LOG(tcp, INFO) << "write: delayed"; notify_on_write(tcp); // tcp_flush does not populate error if it has returned false. DCHECK(error.ok()); @@ -1848,7 +1810,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, size_t i; for (i = 0; i < buf->count; i++) { - gpr_log(GPR_INFO, "WRITE %p (peer=%s)", tcp, tcp->peer_string.c_str()); + LOG(INFO) << "WRITE " << tcp << " (peer=" << tcp->peer_string << ")"; if (ABSL_VLOG_IS_ON(2)) { char* data = grpc_dump_slice(buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -1890,9 +1852,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, TCP_REF(tcp, "write"); tcp->write_cb = cb; tcp->current_zerocopy_send = zerocopy_send_record; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - LOG(INFO) << "write: delayed"; - } + GRPC_TRACE_LOG(tcp, INFO) << "write: delayed"; notify_on_write(tcp); } else { GRPC_TRACE_LOG(tcp, INFO) << "write: " << grpc_core::StatusToString(error); @@ -2031,7 +1991,7 @@ grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, if (setsockopt(tcp->fd, SOL_TCP, TCP_INQ, &one, sizeof(one)) == 0) { tcp->inq_capable = true; } else { - gpr_log(GPR_DEBUG, "cannot set inq fd=%d errno=%d", tcp->fd, errno); + VLOG(2) << "cannot set inq fd=" << tcp->fd << " errno=" << errno; tcp->inq_capable = false; } #else diff --git a/deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc b/deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc index ea8fa935ff..a45a0c8e32 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_server_posix.cc @@ -44,6 +44,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -51,7 +52,6 @@ #include #include #include -#include #include #include @@ -165,23 +165,21 @@ static grpc_error_handle CreateEventEngineListener( ->GetWrappedFd(); if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { - gpr_log(GPR_ERROR, "Failed getpeername: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed getpeername: " + << grpc_core::StrError(errno); close(fd); return; } (void)grpc_set_socket_no_sigpipe_if_possible(fd); auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " + << addr_uri.status().ToString(); return; } - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, - "SERVER_CONNECT: incoming external connection: %s", - addr_uri->c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) << "SERVER_CONNECT: incoming external " + "connection: " + << addr_uri->c_str(); } read_notifier_pollset = (*(s->pollsets))[static_cast( @@ -395,8 +393,7 @@ static void on_read(void* arg, grpc_error_handle err) { // This is not a performant code path, but if an fd limit has been // reached, the system is likely in an unhappy state regardless. if (errno == EMFILE) { - GRPC_LOG_EVERY_N_SEC(1, GPR_ERROR, "%s", - "File descriptor limit reached. Retrying."); + LOG_EVERY_N_SEC(ERROR, 1) << "File descriptor limit reached. Retrying."; grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); if (gpr_atm_full_xchg(&sp->retry_timer_armed, true)) return; grpc_timer_init(&sp->retry_timer, @@ -410,8 +407,7 @@ static void on_read(void* arg, grpc_error_handle err) { } gpr_mu_lock(&sp->server->mu); if (!sp->server->shutdown_listeners) { - gpr_log(GPR_ERROR, "Failed accept4: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed accept4: " << grpc_core::StrError(errno); } else { // if we have shutdown listeners, accept4 could fail, and we // needn't notify users @@ -440,13 +436,11 @@ static void on_read(void* arg, grpc_error_handle err) { if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { auto listener_addr_uri = grpc_sockaddr_to_uri(&sp->addr); - gpr_log( - GPR_ERROR, - "Failed getpeername: %s. Dropping the connection, and continuing " - "to listen on %s:%d.", - grpc_core::StrError(errno).c_str(), - listener_addr_uri.ok() ? listener_addr_uri->c_str() : "", - sp->port); + LOG(ERROR) << "Failed getpeername: " << grpc_core::StrError(errno) + << ". Dropping the connection, and continuing to listen on " + << (listener_addr_uri.ok() ? *listener_addr_uri + : "") + << ":" << sp->port; close(fd); continue; } @@ -462,14 +456,11 @@ static void on_read(void* arg, grpc_error_handle err) { auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " << addr_uri.status(); goto error; } - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "SERVER_CONNECT: incoming connection: %s", - addr_uri->c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "SERVER_CONNECT: incoming connection: " << *addr_uri; std::string name = absl::StrCat("tcp-server-connection:", addr_uri.value()); grpc_fd* fdobj = grpc_fd_create(fd, name.c_str(), true); @@ -913,22 +904,18 @@ class ExternalConnectionHandler : public grpc_core::TcpServerFdHandler { if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { - gpr_log(GPR_ERROR, "Failed getpeername: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed getpeername: " << grpc_core::StrError(errno); close(fd); return; } (void)grpc_set_socket_no_sigpipe_if_possible(fd); auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " << addr_uri.status(); return; } - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "SERVER_CONNECT: incoming external connection: %s", - addr_uri->c_str()); - } + GRPC_TRACE_LOG(tcp, INFO) + << "SERVER_CONNECT: incoming external connection: " << *addr_uri; std::string name = absl::StrCat("tcp-server-connection:", addr_uri.value()); grpc_fd* fdobj = grpc_fd_create(fd, name.c_str(), true); read_notifier_pollset = diff --git a/deps/grpc/src/core/lib/iomgr/tcp_windows.cc b/deps/grpc/src/core/lib/iomgr/tcp_windows.cc index 7e4a2e2d60..b94ffcfe91 100644 --- a/deps/grpc/src/core/lib/iomgr/tcp_windows.cc +++ b/deps/grpc/src/core/lib/iomgr/tcp_windows.cc @@ -29,8 +29,6 @@ #include #include -#include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -142,9 +140,8 @@ static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "TCP unref %p : %s %" PRIdPTR " -> %" PRIdPTR, tcp, reason, val, - val - 1); + VLOG(2).AtLocation(file, line) << "TCP unref " << tcp << " : " << reason + << " " << val << " -> " << val - 1; } if (gpr_unref(&tcp->refcount)) { tcp_free(tcp); @@ -155,9 +152,8 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "TCP ref %p : %s %" PRIdPTR " -> %" PRIdPTR, tcp, reason, val, - val + 1); + VLOG(2).AtLocation(file, line) << "TCP ref " << tcp << " : " << reason + << " " << val << " -> " << val + 1; } gpr_ref(&tcp->refcount); } @@ -180,9 +176,7 @@ static void on_read(void* tcpp, grpc_error_handle error) { grpc_winsocket* socket = tcp->socket; grpc_winsocket_callback_info* info = &socket->read_info; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p on_read", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " on_read"; if (error.ok()) { if (info->wsa_error != 0 && !tcp->shutting_down) { @@ -212,9 +206,7 @@ static void on_read(void* tcpp, grpc_error_handle error) { } } } else { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p unref read_slice", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " unref read_slice"; grpc_slice_buffer_reset_and_unref(tcp->read_slices); error = grpc_error_set_int( tcp->shutting_down ? GRPC_ERROR_CREATE("TCP stream shutting down") @@ -243,9 +235,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, WSABUF buffers[MAX_WSABUF_COUNT]; size_t i; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p win_read", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " win_read"; if (tcp->shutting_down) { grpc_core::ExecCtx::Run( @@ -314,9 +304,7 @@ static void on_write(void* tcpp, grpc_error_handle error) { grpc_winsocket_callback_info* info = &handle->write_info; grpc_closure* cb; - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p on_write", tcp); - } + GRPC_TRACE_LOG(tcp, INFO) << "TCP:" << tcp << " on_write"; gpr_mu_lock(&tcp->mu); cb = tcp->write_cb; diff --git a/deps/grpc/src/core/lib/iomgr/timer_generic.cc b/deps/grpc/src/core/lib/iomgr/timer_generic.cc index 9181383081..7b1c9d205c 100644 --- a/deps/grpc/src/core/lib/iomgr/timer_generic.cc +++ b/deps/grpc/src/core/lib/iomgr/timer_generic.cc @@ -21,12 +21,12 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -334,12 +334,11 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, timer->hash_table_next = nullptr; #endif - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRId64 " now %" PRId64 " call %p[%p]", - timer, deadline.milliseconds_after_process_epoch(), - grpc_core::Timestamp::Now().milliseconds_after_process_epoch(), - closure, closure->cb); - } + GRPC_TRACE_VLOG(timer, 2) + << "TIMER " << timer << ": SET " + << deadline.milliseconds_after_process_epoch() << " now " + << grpc_core::Timestamp::Now().milliseconds_after_process_epoch() + << " call " << closure << "[" << closure->cb << "]"; if (!g_shared_mutables.initialized) { timer->pending = false; @@ -370,14 +369,11 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, timer->heap_index = INVALID_HEAP_INDEX; list_join(&shard->list, timer); } - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, - " .. add to shard %d with queue_deadline_cap=%" PRId64 - " => is_first_timer=%s", - static_cast(shard - g_shards), - shard->queue_deadline_cap.milliseconds_after_process_epoch(), - is_first_timer ? "true" : "false"); - } + GRPC_TRACE_VLOG(timer, 2) + << " .. add to shard " << (shard - g_shards) + << " with queue_deadline_cap=" + << shard->queue_deadline_cap.milliseconds_after_process_epoch() + << " => is_first_timer=" << (is_first_timer ? "true" : "false"); gpr_mu_unlock(&shard->mu); // Deadline may have decreased, we need to adjust the main queue. Note @@ -393,10 +389,9 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, // grpc_timer_check. if (is_first_timer) { gpr_mu_lock(&g_shared_mutables.mu); - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, " .. old shard min_deadline=%" PRId64, - shard->min_deadline.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer, 2) + << " .. old shard min_deadline=" + << shard->min_deadline.milliseconds_after_process_epoch(); if (deadline < shard->min_deadline) { grpc_core::Timestamp old_min_deadline = g_shard_queue[0]->min_deadline; shard->min_deadline = deadline; @@ -435,10 +430,9 @@ static void timer_cancel(grpc_timer* timer) { timer_shard* shard = &g_shards[grpc_core::HashPointer(timer, g_num_shards)]; gpr_mu_lock(&shard->mu); - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: CANCEL pending=%s", timer, - timer->pending ? "true" : "false"); - } + GRPC_TRACE_VLOG(timer, 2) + << "TIMER " << timer + << ": CANCEL pending=" << (timer->pending ? "true" : "false"); if (timer->pending) { REMOVE_FROM_HASH_TABLE(timer); @@ -476,11 +470,9 @@ static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { std::max(now, shard->queue_deadline_cap) + grpc_core::Duration::FromSecondsAsDouble(deadline_delta); - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d]->queue_deadline_cap --> %" PRId64, - static_cast(shard - g_shards), - shard->queue_deadline_cap.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. shard[" << (shard - g_shards) << "]->queue_deadline_cap --> " + << shard->queue_deadline_cap.milliseconds_after_process_epoch(); for (timer = shard->list.next; timer != &shard->list; timer = next) { next = timer->next; auto timer_deadline = @@ -488,10 +480,9 @@ static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { timer->deadline); if (timer_deadline < shard->queue_deadline_cap) { - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. add timer with deadline %" PRId64 " to heap", - timer_deadline.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. add timer with deadline " + << timer_deadline.milliseconds_after_process_epoch() << " to heap"; list_remove(timer); grpc_timer_heap_add(&shard->heap, timer); } @@ -505,11 +496,9 @@ static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { static grpc_timer* pop_one(timer_shard* shard, grpc_core::Timestamp now) { grpc_timer* timer; for (;;) { - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d]: heap_empty=%s", - static_cast(shard - g_shards), - grpc_timer_heap_is_empty(&shard->heap) ? "true" : "false"); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. shard[" << (shard - g_shards) << "]: heap_empty=" + << (grpc_timer_heap_is_empty(&shard->heap) ? "true" : "false"); if (grpc_timer_heap_is_empty(&shard->heap)) { if (now < shard->queue_deadline_cap) return nullptr; if (!refill_heap(shard, now)) return nullptr; @@ -518,17 +507,13 @@ static grpc_timer* pop_one(timer_shard* shard, grpc_core::Timestamp now) { auto timer_deadline = grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( timer->deadline); - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, - " .. check top timer deadline=%" PRId64 " now=%" PRId64, - timer_deadline.milliseconds_after_process_epoch(), - now.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. check top timer deadline=" + << timer_deadline.milliseconds_after_process_epoch() + << " now=" << now.milliseconds_after_process_epoch(); if (timer_deadline > now) return nullptr; - if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: FIRE %" PRId64 "ms late", timer, - (now - timer_deadline).millis()); - } + GRPC_TRACE_VLOG(timer, 2) << "TIMER " << timer << ": FIRE " + << (now - timer_deadline).millis() << "ms late"; timer->pending = false; grpc_timer_heap_pop(&shard->heap); return timer; @@ -549,10 +534,8 @@ static size_t pop_timers(timer_shard* shard, grpc_core::Timestamp now, } *new_min_deadline = compute_min_deadline(shard); gpr_mu_unlock(&shard->mu); - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d] popped %" PRIdPTR, - static_cast(shard - g_shards), n); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. shard[" << (shard - g_shards) << "] popped " << n; return n; } @@ -588,12 +571,10 @@ static grpc_timer_check_result run_some_expired_timers( gpr_mu_lock(&g_shared_mutables.mu); result = GRPC_TIMERS_CHECKED_AND_EMPTY; - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log( - GPR_DEBUG, " .. shard[%d]->min_deadline = %" PRId64, - static_cast(g_shard_queue[0] - g_shards), - g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. shard[" << (g_shard_queue[0] - g_shards) + << "]->min_deadline = " + << g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch(); while (g_shard_queue[0]->min_deadline < now || (now != grpc_core::Timestamp::InfFuture() && @@ -607,17 +588,12 @@ static grpc_timer_check_result run_some_expired_timers( result = GRPC_TIMERS_FIRED; } - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log( - GPR_DEBUG, - " .. result --> %d" - ", shard[%d]->min_deadline %" PRId64 " --> %" PRId64 - ", now=%" PRId64, - result, static_cast(g_shard_queue[0] - g_shards), - g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch(), - new_min_deadline.milliseconds_after_process_epoch(), - now.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << " .. result --> " << result << ", shard[" + << (g_shard_queue[0] - g_shards) << "]->min_deadline " + << g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch() + << " --> " << new_min_deadline.milliseconds_after_process_epoch() + << ", now=" << now.milliseconds_after_process_epoch(); // An grpc_timer_init() on the shard could intervene here, adding a new // timer that is earlier than new_min_deadline. However, @@ -667,11 +643,9 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { if (next != nullptr) { *next = std::min(*next, min_timer); } - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, "TIMER CHECK SKIP: now=%" PRId64 " min_timer=%" PRId64, - now.milliseconds_after_process_epoch(), - min_timer.milliseconds_after_process_epoch()); - } + GRPC_TRACE_VLOG(timer_check, 2) + << "TIMER CHECK SKIP: now=" << now.milliseconds_after_process_epoch() + << " min_timer=" << min_timer.milliseconds_after_process_epoch(); return GRPC_TIMERS_CHECKED_AND_EMPTY; } @@ -689,20 +663,18 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { next_str = absl::StrCat(next->milliseconds_after_process_epoch()); } #if GPR_ARCH_64 - gpr_log( - GPR_DEBUG, - "TIMER CHECK BEGIN: now=%" PRId64 " next=%s tls_min=%" PRId64 - " glob_min=%" PRId64, - now.milliseconds_after_process_epoch(), next_str.c_str(), - min_timer.milliseconds_after_process_epoch(), - grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( - gpr_atm_no_barrier_load((gpr_atm*)(&g_shared_mutables.min_timer))) - .milliseconds_after_process_epoch()); + VLOG(2) << "TIMER CHECK BEGIN: now=" + << now.milliseconds_after_process_epoch() << " next=" << next_str + << " tls_min=" << min_timer.milliseconds_after_process_epoch() + << " glob_min=" + << grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( + gpr_atm_no_barrier_load( + (gpr_atm*)(&g_shared_mutables.min_timer))) + .milliseconds_after_process_epoch(); #else - gpr_log(GPR_DEBUG, - "TIMER CHECK BEGIN: now=%" PRId64 " next=%s min=%" PRId64, - now.milliseconds_after_process_epoch(), next_str.c_str(), - min_timer.milliseconds_after_process_epoch()); + VLOG(2) << "TIMER CHECK BEGIN: now=" + << now.milliseconds_after_process_epoch() << " next=" << next_str + << " min=" << min_timer.milliseconds_after_process_epoch(); #endif } // actual code @@ -716,7 +688,7 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { } else { next_str = absl::StrCat(next->milliseconds_after_process_epoch()); } - gpr_log(GPR_DEBUG, "TIMER CHECK END: r=%d; next=%s", r, next_str.c_str()); + VLOG(2) << "TIMER CHECK END: r=" << r << "; next=" << next_str.c_str(); } return r; } diff --git a/deps/grpc/src/core/lib/iomgr/timer_manager.cc b/deps/grpc/src/core/lib/iomgr/timer_manager.cc index 3e865b6ae0..312ed68a02 100644 --- a/deps/grpc/src/core/lib/iomgr/timer_manager.cc +++ b/deps/grpc/src/core/lib/iomgr/timer_manager.cc @@ -24,7 +24,6 @@ #include "absl/log/log.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -182,8 +181,7 @@ static bool wait_until(grpc_core::Timestamp next) { if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { grpc_core::Duration wait_time = next - grpc_core::Timestamp::Now(); - gpr_log(GPR_INFO, "sleep for a %" PRId64 " milliseconds", - wait_time.millis()); + LOG(INFO) << "sleep for a " << wait_time.millis() << " milliseconds"; } } else { // g_timed_waiter == true && next >= g_timed_waiter_deadline next = grpc_core::Timestamp::InfFuture(); @@ -197,11 +195,10 @@ static bool wait_until(grpc_core::Timestamp next) { gpr_cv_wait(&g_cv_wait, &g_mu, next.as_timespec(GPR_CLOCK_MONOTONIC)); - if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_INFO, "wait ended: was_timed:%d kicked:%d", - my_timed_waiter_generation == g_timed_waiter_generation, - g_kicked); - } + GRPC_TRACE_LOG(timer_check, INFO) + << "wait ended: was_timed:" + << (my_timed_waiter_generation == g_timed_waiter_generation) + << " kicked:" << g_kicked; // if this was the timed waiter, then we need to check timers, and flag // that there's now no timed waiter... we'll look for a replacement if // there's work to do after checking timers (code above) diff --git a/deps/grpc/src/core/lib/iomgr/unix_sockets_posix.cc b/deps/grpc/src/core/lib/iomgr/unix_sockets_posix.cc index 15b2226b68..904cb10faa 100644 --- a/deps/grpc/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/deps/grpc/src/core/lib/iomgr/unix_sockets_posix.cc @@ -37,7 +37,6 @@ #include "absl/strings/str_cat.h" #include -#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc index 8e783c8cb7..1f9038e953 100644 --- a/deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/deps/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -26,8 +26,6 @@ #include "absl/log/check.h" -#include - #include "src/core/lib/gprpp/crash.h" void grpc_create_socketpair_if_unix(int /* sv */[2]) { diff --git a/deps/grpc/src/core/lib/iomgr/vsock.cc b/deps/grpc/src/core/lib/iomgr/vsock.cc index 847dabe0f1..c6dc71a843 100644 --- a/deps/grpc/src/core/lib/iomgr/vsock.cc +++ b/deps/grpc/src/core/lib/iomgr/vsock.cc @@ -28,7 +28,6 @@ #include "absl/strings/str_cat.h" #include -#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gprpp/crash.h" diff --git a/deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc index 38760c2cfb..fcdb63b2e5 100644 --- a/deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/deps/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -26,8 +26,6 @@ #include #include -#include - #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" diff --git a/deps/grpc/src/core/lib/promise/activity.h b/deps/grpc/src/core/lib/promise/activity.h index 715de5317f..55738c0899 100644 --- a/deps/grpc/src/core/lib/promise/activity.h +++ b/deps/grpc/src/core/lib/promise/activity.h @@ -29,11 +29,11 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" -#include #include -#include "src/core/lib/event_engine/event_engine_context.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/lib/gprpp/dump_args.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/sync.h" @@ -41,6 +41,7 @@ #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -544,6 +545,8 @@ class PromiseActivity final } void WakeupAsync(WakeupMask) final { + GRPC_LATENT_SEE_INNER_SCOPE("PromiseActivity::WakeupAsync"); + wakeup_flow_.Begin(GRPC_LATENT_SEE_METADATA("Activity::Wakeup")); if (!wakeup_scheduled_.exchange(true, std::memory_order_acq_rel)) { // Can't safely run, so ask to run later. this->ScheduleWakeup(); @@ -567,6 +570,8 @@ class PromiseActivity final // In response to Wakeup, run the Promise state machine again until it // settles. Then check for completion, and if we have completed, call on_done. void Step() ABSL_LOCKS_EXCLUDED(mu()) { + GRPC_LATENT_SEE_PARENT_SCOPE("PromiseActivity::Step"); + wakeup_flow_.End(); // Poll the promise until things settle out under a lock. mu()->Lock(); if (done_) { @@ -643,6 +648,7 @@ class PromiseActivity final GPR_NO_UNIQUE_ADDRESS Promise promise; }; GPR_NO_UNIQUE_ADDRESS PromiseHolder promise_holder_ ABSL_GUARDED_BY(mu()); + GPR_NO_UNIQUE_ADDRESS latent_see::Flow wakeup_flow_; }; } // namespace promise_detail @@ -662,7 +668,11 @@ ActivityPtr MakeActivity(Factory promise_factory, } inline Pending IntraActivityWaiter::pending() { - wakeups_ |= GetContext()->CurrentParticipant(); + const auto new_wakeups = GetContext()->CurrentParticipant(); + GRPC_TRACE_LOG(promise_primitives, INFO) + << "IntraActivityWaiter::pending: " + << GRPC_DUMP_ARGS(this, new_wakeups, wakeups_); + wakeups_ |= new_wakeups; return Pending(); } diff --git a/deps/grpc/src/core/lib/promise/all_ok.h b/deps/grpc/src/core/lib/promise/all_ok.h index 1f15631ac2..63abaf754d 100644 --- a/deps/grpc/src/core/lib/promise/all_ok.h +++ b/deps/grpc/src/core/lib/promise/all_ok.h @@ -39,17 +39,21 @@ struct AllOkTraits { template using ResultType = Result; template - static bool IsOk(const T& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const T& x) { return IsStatusOk(x); } - static Empty Unwrapped(StatusFlag) { return Empty{}; } - static Empty Unwrapped(absl::Status) { return Empty{}; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(StatusFlag) { + return Empty{}; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(absl::Status) { + return Empty{}; + } template - static R EarlyReturn(T&& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(T&& x) { return StatusCast(std::forward(x)); } template - static Result FinalReturn(A&&...) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Result FinalReturn(A&&...) { return Result{}; } }; @@ -58,8 +62,11 @@ struct AllOkTraits { template class AllOk { public: - explicit AllOk(Promises... promises) : state_(std::move(promises)...) {} - auto operator()() { return state_.PollOnce(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit AllOk(Promises... promises) + : state_(std::move(promises)...) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() { + return state_.PollOnce(); + } private: JoinState, Promises...> state_; @@ -71,7 +78,7 @@ class AllOk { // If any fail, cancel the rest and return the failure. // If all succeed, return Ok. template -auto AllOk(Promises... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto AllOk(Promises... promises) { return promise_detail::AllOk(std::move(promises)...); } diff --git a/deps/grpc/src/core/lib/promise/cancel_callback.h b/deps/grpc/src/core/lib/promise/cancel_callback.h index b02b2a45ff..ed999c293f 100644 --- a/deps/grpc/src/core/lib/promise/cancel_callback.h +++ b/deps/grpc/src/core/lib/promise/cancel_callback.h @@ -28,26 +28,28 @@ namespace cancel_callback_detail { template class Handler { public: - explicit Handler(Fn fn) : fn_(std::move(fn)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Handler(Fn fn) + : fn_(std::move(fn)) {} Handler(const Handler&) = delete; Handler& operator=(const Handler&) = delete; - ~Handler() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Handler() { if (!done_) { promise_detail::Context ctx(arena_.get()); fn_(); } } - Handler(Handler&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Handler(Handler&& other) noexcept : fn_(std::move(other.fn_)), done_(other.done_) { other.done_ = true; } - Handler& operator=(Handler&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Handler& operator=( + Handler&& other) noexcept { fn_ = std::move(other.fn_); done_ = other.done_; other.done_ = true; } - void Done() { done_ = true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Done() { done_ = true; } private: Fn fn_; @@ -67,7 +69,8 @@ class Handler { // completion. // Returns a promise with the same result type as main_fn. template -auto OnCancel(MainFn main_fn, CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancel(MainFn main_fn, + CancelFn cancel_fn) { return [on_cancel = cancel_callback_detail::Handler(std::move(cancel_fn)), main_fn = promise_detail::PromiseLike( @@ -84,7 +87,8 @@ auto OnCancel(MainFn main_fn, CancelFn cancel_fn) { // resulting promise. If the factory is dropped without being called, cancel_fn // is called. template -auto OnCancelFactory(MainFn main_fn, CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancelFactory(MainFn main_fn, + CancelFn cancel_fn) { return [on_cancel = cancel_callback_detail::Handler(std::move(cancel_fn)), main_fn = std::move(main_fn)]() mutable { diff --git a/deps/grpc/src/core/lib/promise/context.h b/deps/grpc/src/core/lib/promise/context.h index e1f1f6511d..61520707d2 100644 --- a/deps/grpc/src/core/lib/promise/context.h +++ b/deps/grpc/src/core/lib/promise/context.h @@ -20,7 +20,6 @@ #include "absl/log/check.h" #include "absl/meta/type_traits.h" -#include #include #include "src/core/lib/gprpp/down_cast.h" @@ -62,7 +61,7 @@ class ThreadLocalContext : public ContextType { ThreadLocalContext(const ThreadLocalContext&) = delete; ThreadLocalContext& operator=(const ThreadLocalContext&) = delete; - static T* get() { return current_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T* get() { return current_; } private: T* const old_; @@ -83,7 +82,7 @@ class Context::Base>> : public Context::Base> { public: using Context::Base>::Context; - static T* get() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T* get() { return DownCast(Context::Base>::get()); } }; @@ -107,26 +106,26 @@ class WithContext { // Return true if a context of type T is currently active. template -bool HasContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool HasContext() { return promise_detail::Context::get() != nullptr; } // Retrieve the current value of a context, or abort if the value is unset. template -T* GetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* GetContext() { auto* p = promise_detail::Context::get(); - CHECK_NE(p, nullptr); + DCHECK_NE(p, nullptr); return p; } // Retrieve the current value of a context, or nullptr if the value is unset. template -T* MaybeGetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* MaybeGetContext() { return promise_detail::Context::get(); } template -void SetContext(T* p) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void SetContext(T* p) { promise_detail::Context::set(p); } diff --git a/deps/grpc/src/core/lib/promise/detail/join_state.h b/deps/grpc/src/core/lib/promise/detail/join_state.h index 5f0effcb65..403ec38b06 100644 --- a/deps/grpc/src/core/lib/promise/detail/join_state.h +++ b/deps/grpc/src/core/lib/promise/detail/join_state.h @@ -15,7 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_JOIN_STATE_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_JOIN_STATE_H -// This file is generated by tools/codegen/core/gen_seq.py +// This file is generated by tools/codegen/core/gen_join.py #include #include @@ -54,30 +54,23 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result1 result1; }; GPR_NO_UNIQUE_ADDRESS BitSet<2> ready; - JoinState(P0&& p0, P1&& p1) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -91,17 +84,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/2"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/2 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/2 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -111,19 +103,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/2 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/2 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/2"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/2 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/2 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -133,8 +125,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/2 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/2 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1)); @@ -166,37 +159,26 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result2 result2; }; GPR_NO_UNIQUE_ADDRESS BitSet<3> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -215,17 +197,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/3"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -235,19 +216,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/3 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/3 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/3"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -257,19 +238,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/3 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/3 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/3"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -279,8 +260,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/3 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/3 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -319,14 +301,15 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result3 result3; }; GPR_NO_UNIQUE_ADDRESS BitSet<4> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); Construct(&promise3, std::forward(p3)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -334,29 +317,14 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -380,17 +348,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/4"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -400,19 +367,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/4 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/4 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/4"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -422,19 +389,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/4 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/4 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/4"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -444,19 +411,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/4 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/4 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/4"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -466,8 +433,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/4 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/4 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -513,15 +481,16 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result4 result4; }; GPR_NO_UNIQUE_ADDRESS BitSet<5> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); Construct(&promise3, std::forward(p3)); Construct(&promise4, std::forward(p4)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -530,34 +499,15 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -586,17 +536,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/5"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -606,19 +555,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/5 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/5 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/5"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -628,19 +577,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/5 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/5 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/5"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -650,19 +599,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/5 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/5 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/5"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -672,19 +621,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/5 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/5 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/5"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -694,8 +643,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/5 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/5 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -748,7 +698,8 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result5 result5; }; GPR_NO_UNIQUE_ADDRESS BitSet<6> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -756,8 +707,8 @@ struct JoinState { Construct(&promise4, std::forward(p4)); Construct(&promise5, std::forward(p5)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -767,39 +718,16 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -833,17 +761,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/6"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -853,19 +780,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/6 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/6"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -875,19 +802,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/6 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/6"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -897,19 +824,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/6 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/6"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -919,19 +846,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/6 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/6"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -941,19 +868,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/6 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/6"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -963,8 +890,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/6 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/6 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1023,7 +951,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result6 result6; }; GPR_NO_UNIQUE_ADDRESS BitSet<7> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1032,8 +962,8 @@ struct JoinState { Construct(&promise5, std::forward(p5)); Construct(&promise6, std::forward(p6)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1044,44 +974,17 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1120,17 +1023,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/7"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1140,19 +1042,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/7 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/7"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1162,19 +1064,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/7 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/7"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1184,19 +1086,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/7 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/7"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1206,19 +1108,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/7 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/7"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1228,19 +1130,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/7 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/7"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1250,19 +1152,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/7 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/7"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1272,8 +1174,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/7 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/7 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1339,8 +1242,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result7 result7; }; GPR_NO_UNIQUE_ADDRESS BitSet<8> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, - P7&& p7) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6, P7&& p7) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1350,8 +1254,8 @@ struct JoinState { Construct(&promise6, std::forward(p6)); Construct(&promise7, std::forward(p7)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1363,49 +1267,18 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } - if (ready.is_set(7)) { - Construct(&result7, std::move(other.result7)); - } else { - Construct(&promise7, std::move(other.promise7)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); + Construct(&promise7, std::move(other.promise7)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1449,17 +1322,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/8"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1469,19 +1341,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/8 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/8"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1491,19 +1363,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/8 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/8"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1513,19 +1385,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/8 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/8"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1535,19 +1407,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/8 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/8"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1557,19 +1429,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/8 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/8"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1579,19 +1451,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/8 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/8"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1601,19 +1473,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/8 already ready"; } if (!ready.is_set(7)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 8/8"; auto poll = promise7(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 8/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 8/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(7); @@ -1623,8 +1495,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 8/8 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 8/8 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1696,8 +1569,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result8 result8; }; GPR_NO_UNIQUE_ADDRESS BitSet<9> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, - P7&& p7, P8&& p8) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6, P7&& p7, P8&& p8) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1708,8 +1582,8 @@ struct JoinState { Construct(&promise7, std::forward(p7)); Construct(&promise8, std::forward(p8)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1722,54 +1596,19 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } - if (ready.is_set(7)) { - Construct(&result7, std::move(other.result7)); - } else { - Construct(&promise7, std::move(other.promise7)); - } - if (ready.is_set(8)) { - Construct(&result8, std::move(other.result8)); - } else { - Construct(&promise8, std::move(other.promise8)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); + Construct(&promise7, std::move(other.promise7)); + Construct(&promise8, std::move(other.promise8)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1819,17 +1658,16 @@ struct JoinState { using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/9"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1839,19 +1677,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/9 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/9"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1861,19 +1699,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/9 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/9"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1883,19 +1721,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/9 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/9"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1905,19 +1743,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/9 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/9"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1927,19 +1765,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/9 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/9"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1949,19 +1787,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/9 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/9"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1971,19 +1809,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/9 already ready"; } if (!ready.is_set(7)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 8/9"; auto poll = promise7(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 8/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 8/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(7); @@ -1993,19 +1831,19 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 8/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 8/9 already ready"; } if (!ready.is_set(8)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 9/9"; auto poll = promise8(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 9/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 9/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(8); @@ -2015,8 +1853,9 @@ struct JoinState { return Traits::template EarlyReturn(std::move(*p)); } } - } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 9/9 already ready"; + } else { + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 9/9 already ready"; } if (ready.all()) { return Traits::FinalReturn( diff --git a/deps/grpc/src/core/lib/promise/detail/promise_factory.h b/deps/grpc/src/core/lib/promise/detail/promise_factory.h index 7e38411b8b..1e50774392 100644 --- a/deps/grpc/src/core/lib/promise/detail/promise_factory.h +++ b/deps/grpc/src/core/lib/promise/detail/promise_factory.h @@ -115,41 +115,44 @@ class Curried { // Promote a callable(A) -> T | Poll to a PromiseFactory(A) -> Promise by // capturing A. template -absl::enable_if_t>::value, - PromiseLike, A>>> -PromiseFactoryImpl(F&& f, A&& arg) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike, A>>> + PromiseFactoryImpl(F&& f, A&& arg) { return Curried, A>(std::forward(f), std::forward(arg)); } // Promote a callable() -> T|Poll to a PromiseFactory(A) -> Promise // by dropping the argument passed to the factory. template -absl::enable_if_t>::value, - PromiseLike>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + !IsVoidCallable>::value, PromiseLike>> PromiseFactoryImpl(F f, A&&) { return PromiseLike(std::move(f)); } // Promote a callable() -> T|Poll to a PromiseFactory() -> Promise template -absl::enable_if_t>::value, - PromiseLike>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + !IsVoidCallable>::value, PromiseLike>> PromiseFactoryImpl(F f) { return PromiseLike(std::move(f)); } // Given a callable(A) -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()(std::declval()))>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + IsVoidCallable>::value, + PromiseLike()(std::declval()))>> PromiseFactoryImpl(F&& f, A&& arg) { return f(std::forward(arg)); } // Given a callable(A) -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()(std::declval()))>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + IsVoidCallable>::value, + PromiseLike()(std::declval()))>> PromiseFactoryImpl(F& f, A&& arg) { return f(std::forward(arg)); } @@ -157,17 +160,19 @@ PromiseFactoryImpl(F& f, A&& arg) { // Given a callable() -> Promise, promote it to a // PromiseFactory(A) -> Promise by dropping the first argument. template -absl::enable_if_t>::value, - PromiseLike()())>> -PromiseFactoryImpl(F&& f, A&&) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike()())>> + PromiseFactoryImpl(F&& f, A&&) { return f(); } // Given a callable() -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()())>> -PromiseFactoryImpl(F&& f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike()())>> + PromiseFactoryImpl(F&& f) { return f(); } @@ -181,9 +186,10 @@ class OncePromiseFactory { using Promise = decltype(PromiseFactoryImpl(std::move(f_), std::declval())); - explicit OncePromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit OncePromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make(Arg&& a) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) { return PromiseFactoryImpl(std::move(f_), std::forward(a)); } }; @@ -197,9 +203,12 @@ class OncePromiseFactory { using Arg = void; using Promise = decltype(PromiseFactoryImpl(std::move(f_))); - explicit OncePromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit OncePromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make() { return PromiseFactoryImpl(std::move(f_)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() { + return PromiseFactoryImpl(std::move(f_)); + } }; template @@ -211,12 +220,15 @@ class RepeatedPromiseFactory { using Arg = A; using Promise = decltype(PromiseFactoryImpl(f_, std::declval())); - explicit RepeatedPromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit RepeatedPromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make(Arg&& a) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) const { + return PromiseFactoryImpl(f_, std::forward(a)); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) { return PromiseFactoryImpl(f_, std::forward(a)); } - Promise Make(Arg&& a) { return PromiseFactoryImpl(f_, std::forward(a)); } }; template @@ -228,10 +240,15 @@ class RepeatedPromiseFactory { using Arg = void; using Promise = decltype(PromiseFactoryImpl(f_)); - explicit RepeatedPromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit RepeatedPromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make() const { return PromiseFactoryImpl(f_); } - Promise Make() { return PromiseFactoryImpl(f_); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() const { + return PromiseFactoryImpl(f_); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() { + return PromiseFactoryImpl(f_); + } }; } // namespace promise_detail diff --git a/deps/grpc/src/core/lib/promise/detail/promise_like.h b/deps/grpc/src/core/lib/promise/detail/promise_like.h index 8be6165754..60a7fcc26b 100644 --- a/deps/grpc/src/core/lib/promise/detail/promise_like.h +++ b/deps/grpc/src/core/lib/promise/detail/promise_like.h @@ -51,16 +51,21 @@ namespace promise_detail { template struct PollWrapper { - static Poll Wrap(T&& x) { return Poll(std::forward(x)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Wrap(T&& x) { + return Poll(std::forward(x)); + } }; template struct PollWrapper> { - static Poll Wrap(Poll&& x) { return std::forward>(x); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Wrap(Poll&& x) { + return std::forward>(x); + } }; template -auto WrapInPoll(T&& x) -> decltype(PollWrapper::Wrap(std::forward(x))) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto WrapInPoll(T&& x) + -> decltype(PollWrapper::Wrap(std::forward(x))) { return PollWrapper::Wrap(std::forward(x)); } @@ -88,8 +93,12 @@ class PromiseLike(f)) {} - auto operator()() -> decltype(WrapInPoll(f_())) { return WrapInPoll(f_()); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PromiseLike(F&& f) + : f_(std::forward(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() + -> decltype(WrapInPoll(f_())) { + return WrapInPoll(f_()); + } using Result = typename PollTraits::Type; }; diff --git a/deps/grpc/src/core/lib/promise/detail/seq_state.h b/deps/grpc/src/core/lib/promise/detail/seq_state.h index d343e32a32..245b8ac26f 100644 --- a/deps/grpc/src/core/lib/promise/detail/seq_state.h +++ b/deps/grpc/src/core/lib/promise/detail/seq_state.h @@ -102,11 +102,13 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, DebugLocation whence) noexcept : whence(whence) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, + DebugLocation whence) noexcept + : whence(whence) { Construct(&prior.current_promise, std::forward

(p)); Construct(&prior.next_factory, std::forward(f0)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.current_promise); @@ -118,49 +120,39 @@ struct SeqState { tail0: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); + DCHECK(state == State::kState0); Construct(&prior.current_promise, other.prior.current_promise); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.current_promise, std::move(other.prior.current_promise)); Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/2"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/2"; auto result = prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/2 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/2 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -176,16 +168,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/2"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/2"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/2 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/2 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -230,13 +220,14 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.next_factory, std::forward(f0)); Construct(&prior.next_factory, std::forward(f1)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.current_promise); @@ -253,57 +244,43 @@ struct SeqState { tail1: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.current_promise, other.prior.prior.current_promise); Construct(&prior.prior.next_factory, other.prior.prior.next_factory); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.current_promise, + std::move(other.prior.prior.current_promise)); Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail1: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/3"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/3"; auto result = prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/3 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/3 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -318,24 +295,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/3"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/3"; auto result = prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/3 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/3 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -351,16 +325,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/3"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/3"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/3 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/3 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -417,14 +389,16 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.prior.next_factory, std::forward(f0)); Construct(&prior.prior.next_factory, std::forward(f1)); Construct(&prior.next_factory, std::forward(f2)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.current_promise); @@ -446,66 +420,48 @@ struct SeqState { tail2: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.current_promise, + other.prior.prior.prior.current_promise); Construct(&prior.prior.prior.next_factory, other.prior.prior.prior.next_factory); Construct(&prior.prior.next_factory, other.prior.prior.next_factory); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail2: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/4"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/4"; auto result = prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/4 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/4 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -520,24 +476,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/4"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/4"; auto result = prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/4 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/4 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -552,24 +505,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/4"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/4"; auto result = prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/4 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/4 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -585,16 +535,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/4"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/4"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/4 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/4 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -663,8 +611,9 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.prior.prior.next_factory, std::forward(f0)); @@ -672,7 +621,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f2)); Construct(&prior.next_factory, std::forward(f3)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.current_promise); @@ -699,10 +648,11 @@ struct SeqState { tail3: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.next_factory, @@ -711,63 +661,39 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail3: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/5"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/5"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/5 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/5 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -782,24 +708,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/5"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/5"; auto result = prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/5 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/5 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -814,24 +737,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/5"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/5"; auto result = prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/5 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/5 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -846,24 +766,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/5"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/5"; auto result = prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/5 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/5 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -879,16 +796,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/5"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/5"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/5 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/5 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -976,8 +891,9 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -988,7 +904,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f3)); Construct(&prior.next_factory, std::forward(f4)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.current_promise); @@ -1020,10 +936,11 @@ struct SeqState { tail4: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.next_factory, @@ -1034,71 +951,41 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail4: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/6"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/6 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/6 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -1114,24 +1001,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/6"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/6 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/6 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -1146,24 +1030,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/6"; auto result = prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/6 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/6 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -1178,24 +1059,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/6"; auto result = prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/6 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/6 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -1210,24 +1088,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/6"; auto result = prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/6 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/6 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -1243,16 +1118,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/6"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/6"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/6 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/6 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -1353,8 +1226,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -1367,7 +1242,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f4)); Construct(&prior.next_factory, std::forward(f5)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.current_promise); @@ -1404,10 +1279,11 @@ struct SeqState { tail5: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.prior.next_factory, @@ -1420,81 +1296,45 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.current_promise)); Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail5: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/7"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/7 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/7 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -1510,24 +1350,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/7"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/7 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/7 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -1543,24 +1380,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/7"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/7 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/7 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -1575,24 +1409,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/7"; auto result = prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/7 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/7 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -1607,24 +1438,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/7"; auto result = prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/7 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/7 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -1639,24 +1467,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/7"; auto result = prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/7 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/7 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -1672,16 +1497,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/7"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/7"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/7 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/7 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -1796,8 +1619,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -1812,7 +1637,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f5)); Construct(&prior.next_factory, std::forward(f6)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise); @@ -1854,10 +1679,11 @@ struct SeqState { tail6: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.prior.prior.next_factory, @@ -1872,92 +1698,51 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move( + other.prior.prior.prior.prior.prior.prior.prior.current_promise)); Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail6: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/8"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/8 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/8 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -1974,24 +1759,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/8"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/8 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/8 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -2007,24 +1789,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/8"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/8 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/8 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -2040,24 +1819,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/8"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/8 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/8 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -2072,24 +1848,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/8"; auto result = prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/8 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/8 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -2104,24 +1877,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/8"; auto result = prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/8 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/8 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -2136,24 +1906,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/8"; auto result = prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/8 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/8 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -2169,16 +1936,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/8"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/8"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/8 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/8 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -2306,8 +2071,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -2324,7 +2091,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f6)); Construct(&prior.next_factory, std::forward(f7)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct( @@ -2372,10 +2139,12 @@ struct SeqState { tail7: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.current_promise); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory); @@ -2393,102 +2162,53 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail7: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/9"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/9 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/9 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -2506,25 +2226,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/9"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/9 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/9 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -2541,24 +2258,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/9"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/9 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/9 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -2574,24 +2288,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/9"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/9 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/9 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -2607,24 +2318,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/9"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/9 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/9 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -2639,24 +2347,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/9"; auto result = prior.prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/9 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/9 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -2671,24 +2376,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/9"; auto result = prior.prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/9 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/9 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -2703,24 +2405,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/9"; auto result = prior.current_promise(); PromiseResult7* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/9 gets " - << (p != nullptr - ? (PromiseResultTraits7::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits7::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/9 gets " + << (p != nullptr + ? (PromiseResultTraits7::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits7::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits7::IsOk(*p)) { return PromiseResultTraits7::template ReturnValue( @@ -2736,16 +2435,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState8: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 9/9"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 9/9"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 9/9 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 9/9 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -2886,8 +2583,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, + DebugLocation whence) noexcept : whence(whence) { Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, @@ -2908,7 +2608,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f7)); Construct(&prior.next_factory, std::forward(f8)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -2963,10 +2663,13 @@ struct SeqState { tail8: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -2988,113 +2691,58 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise)); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail8: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/10"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/10 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/10 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -3114,25 +2762,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/10"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/10 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/10 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -3150,25 +2795,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/10"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/10 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/10 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -3185,24 +2827,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/10"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/10 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/10 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -3218,24 +2857,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/10"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/10 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/10 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -3251,24 +2887,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/10"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/10 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/10 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -3283,24 +2916,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/10"; auto result = prior.prior.prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/10 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/10 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -3315,24 +2945,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/10"; auto result = prior.prior.current_promise(); PromiseResult7* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/10 gets " - << (p != nullptr - ? (PromiseResultTraits7::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits7::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/10 gets " + << (p != nullptr + ? (PromiseResultTraits7::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits7::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits7::IsOk(*p)) { return PromiseResultTraits7::template ReturnValue( @@ -3347,24 +2974,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState8: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 9/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 9/10"; auto result = prior.current_promise(); PromiseResult8* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 9/10 gets " - << (p != nullptr - ? (PromiseResultTraits8::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits8::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 9/10 gets " + << (p != nullptr + ? (PromiseResultTraits8::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits8::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits8::IsOk(*p)) { return PromiseResultTraits8::template ReturnValue( @@ -3380,16 +3004,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState9: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 10/10"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 10/10"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 10/10 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 10/10 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -3543,8 +3165,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise, @@ -3568,7 +3193,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f8)); Construct(&prior.next_factory, std::forward(f9)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -3630,10 +3255,13 @@ struct SeqState { tail9: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -3659,124 +3287,62 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail9: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/11"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/11 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/11 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -3797,25 +3363,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/11"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/11 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/11 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -3835,25 +3398,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/11"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/11 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/11 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -3871,25 +3431,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/11"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/11 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/11 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -3906,24 +3463,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/11"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/11 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/11 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -3939,24 +3493,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/11"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/11 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/11 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -3972,24 +3523,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/11"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/11 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/11 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -4004,24 +3552,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/11"; auto result = prior.prior.prior.current_promise(); PromiseResult7* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/11 gets " - << (p != nullptr - ? (PromiseResultTraits7::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits7::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/11 gets " + << (p != nullptr + ? (PromiseResultTraits7::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits7::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits7::IsOk(*p)) { return PromiseResultTraits7::template ReturnValue( @@ -4036,24 +3581,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState8: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 9/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 9/11"; auto result = prior.prior.current_promise(); PromiseResult8* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 9/11 gets " - << (p != nullptr - ? (PromiseResultTraits8::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits8::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 9/11 gets " + << (p != nullptr + ? (PromiseResultTraits8::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits8::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits8::IsOk(*p)) { return PromiseResultTraits8::template ReturnValue( @@ -4068,24 +3610,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState9: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 10/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 10/11"; auto result = prior.current_promise(); PromiseResult9* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 10/11 gets " - << (p != nullptr - ? (PromiseResultTraits9::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits9::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 10/11 gets " + << (p != nullptr + ? (PromiseResultTraits9::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits9::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits9::IsOk(*p)) { return PromiseResultTraits9::template ReturnValue( @@ -4101,16 +3640,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState10: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 11/11"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 11/11"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 11/11 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 11/11 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -4277,8 +3814,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, F10&& f10, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, F10&& f10, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise, @@ -4305,7 +3845,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f9)); Construct(&prior.next_factory, std::forward(f10)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -4374,10 +3914,13 @@ struct SeqState { tail10: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -4407,135 +3950,66 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail4; - case State::kState5: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail10; - case State::kState11: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail3: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail4: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail9: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail10: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/12"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/12 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/12 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -4556,25 +4030,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/12"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/12 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/12 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -4595,25 +4066,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/12"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/12 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/12 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -4633,25 +4101,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/12"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/12 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/12 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -4669,25 +4134,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/12"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/12 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/12 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -4704,24 +4166,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/12"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/12 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/12 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -4737,24 +4196,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/12"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/12 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/12 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -4770,24 +4226,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/12"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult7* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/12 gets " - << (p != nullptr - ? (PromiseResultTraits7::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits7::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/12 gets " + << (p != nullptr + ? (PromiseResultTraits7::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits7::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits7::IsOk(*p)) { return PromiseResultTraits7::template ReturnValue( @@ -4802,24 +4255,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState8: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 9/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 9/12"; auto result = prior.prior.prior.current_promise(); PromiseResult8* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 9/12 gets " - << (p != nullptr - ? (PromiseResultTraits8::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits8::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 9/12 gets " + << (p != nullptr + ? (PromiseResultTraits8::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits8::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits8::IsOk(*p)) { return PromiseResultTraits8::template ReturnValue( @@ -4834,24 +4284,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState9: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 10/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 10/12"; auto result = prior.prior.current_promise(); PromiseResult9* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 10/12 gets " - << (p != nullptr - ? (PromiseResultTraits9::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits9::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 10/12 gets " + << (p != nullptr + ? (PromiseResultTraits9::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits9::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits9::IsOk(*p)) { return PromiseResultTraits9::template ReturnValue( @@ -4866,24 +4313,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState10: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 11/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 11/12"; auto result = prior.current_promise(); PromiseResult10* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 11/12 gets " - << (p != nullptr - ? (PromiseResultTraits10::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits10::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 11/12 gets " + << (p != nullptr + ? (PromiseResultTraits10::IsOk(*p) + ? "ready" + : absl::StrCat( + "early-error:", + PromiseResultTraits10::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits10::IsOk(*p)) { return PromiseResultTraits10::template ReturnValue( @@ -4899,16 +4344,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState11: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 12/12"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 12/12"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 12/12 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 12/12 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); @@ -5089,9 +4532,12 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, F10&& f10, F11&& f11, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, F10&& f10, + F11&& f11, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.current_promise, @@ -5121,7 +4567,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f10)); Construct(&prior.next_factory, std::forward(f11)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -5197,10 +4643,13 @@ struct SeqState { tail11: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -5234,147 +4683,70 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail5; - case State::kState6: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail10; - case State::kState11: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail11; - case State::kState12: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail4: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail5: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail9: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail10: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail11: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 1/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 1/13"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.current_promise(); PromiseResult0* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 1/13 gets " - << (p != nullptr - ? (PromiseResultTraits0::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits0::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 1/13 gets " + << (p != nullptr + ? (PromiseResultTraits0::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits0::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits0::IsOk(*p)) { return PromiseResultTraits0::template ReturnValue( @@ -5395,25 +4767,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState1: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 2/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 2/13"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.current_promise(); PromiseResult1* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 2/13 gets " - << (p != nullptr - ? (PromiseResultTraits1::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits1::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 2/13 gets " + << (p != nullptr + ? (PromiseResultTraits1::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits1::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits1::IsOk(*p)) { return PromiseResultTraits1::template ReturnValue( @@ -5434,25 +4803,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState2: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 3/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 3/13"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.current_promise(); PromiseResult2* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 3/13 gets " - << (p != nullptr - ? (PromiseResultTraits2::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits2::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 3/13 gets " + << (p != nullptr + ? (PromiseResultTraits2::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits2::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits2::IsOk(*p)) { return PromiseResultTraits2::template ReturnValue( @@ -5473,25 +4839,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState3: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 4/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 4/13"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise(); PromiseResult3* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 4/13 gets " - << (p != nullptr - ? (PromiseResultTraits3::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits3::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 4/13 gets " + << (p != nullptr + ? (PromiseResultTraits3::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits3::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits3::IsOk(*p)) { return PromiseResultTraits3::template ReturnValue( @@ -5511,25 +4874,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState4: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 5/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 5/13"; auto result = prior.prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult4* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 5/13 gets " - << (p != nullptr - ? (PromiseResultTraits4::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits4::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 5/13 gets " + << (p != nullptr + ? (PromiseResultTraits4::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits4::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits4::IsOk(*p)) { return PromiseResultTraits4::template ReturnValue( @@ -5547,25 +4907,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState5: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 6/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 6/13"; auto result = prior.prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult5* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 6/13 gets " - << (p != nullptr - ? (PromiseResultTraits5::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits5::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 6/13 gets " + << (p != nullptr + ? (PromiseResultTraits5::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits5::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits5::IsOk(*p)) { return PromiseResultTraits5::template ReturnValue( @@ -5582,24 +4939,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState6: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 7/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 7/13"; auto result = prior.prior.prior.prior.prior.prior.current_promise(); PromiseResult6* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 7/13 gets " - << (p != nullptr - ? (PromiseResultTraits6::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits6::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 7/13 gets " + << (p != nullptr + ? (PromiseResultTraits6::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits6::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits6::IsOk(*p)) { return PromiseResultTraits6::template ReturnValue( @@ -5615,24 +4969,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState7: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 8/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 8/13"; auto result = prior.prior.prior.prior.prior.current_promise(); PromiseResult7* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 8/13 gets " - << (p != nullptr - ? (PromiseResultTraits7::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits7::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 8/13 gets " + << (p != nullptr + ? (PromiseResultTraits7::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits7::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits7::IsOk(*p)) { return PromiseResultTraits7::template ReturnValue( @@ -5648,24 +4999,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState8: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 9/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 9/13"; auto result = prior.prior.prior.prior.current_promise(); PromiseResult8* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 9/13 gets " - << (p != nullptr - ? (PromiseResultTraits8::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits8::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 9/13 gets " + << (p != nullptr + ? (PromiseResultTraits8::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits8::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits8::IsOk(*p)) { return PromiseResultTraits8::template ReturnValue( @@ -5680,24 +5028,21 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState9: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 10/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 10/13"; auto result = prior.prior.prior.current_promise(); PromiseResult9* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 10/13 gets " - << (p != nullptr - ? (PromiseResultTraits9::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits9::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 10/13 gets " + << (p != nullptr + ? (PromiseResultTraits9::IsOk(*p) + ? "ready" + : absl::StrCat("early-error:", + PromiseResultTraits9::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits9::IsOk(*p)) { return PromiseResultTraits9::template ReturnValue( @@ -5712,24 +5057,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState10: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 11/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 11/13"; auto result = prior.prior.current_promise(); PromiseResult10* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 11/13 gets " - << (p != nullptr - ? (PromiseResultTraits10::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits10::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 11/13 gets " + << (p != nullptr + ? (PromiseResultTraits10::IsOk(*p) + ? "ready" + : absl::StrCat( + "early-error:", + PromiseResultTraits10::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits10::IsOk(*p)) { return PromiseResultTraits10::template ReturnValue( @@ -5744,24 +5087,22 @@ struct SeqState { } ABSL_FALLTHROUGH_INTENDED; case State::kState11: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 12/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 12/13"; auto result = prior.current_promise(); PromiseResult11* p = result.value_if_ready(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 12/13 gets " - << (p != nullptr - ? (PromiseResultTraits11::IsOk(*p) - ? "ready" - : absl::StrCat( - "early-error:", - PromiseResultTraits11::ErrorString(*p)) - .c_str()) - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 12/13 gets " + << (p != nullptr + ? (PromiseResultTraits11::IsOk(*p) + ? "ready" + : absl::StrCat( + "early-error:", + PromiseResultTraits11::ErrorString(*p)) + .c_str()) + : "pending"); if (p == nullptr) return Pending{}; if (!PromiseResultTraits11::IsOk(*p)) { return PromiseResultTraits11::template ReturnValue( @@ -5777,16 +5118,14 @@ struct SeqState { ABSL_FALLTHROUGH_INTENDED; default: case State::kState12: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: begin poll step 13/13"; - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: begin poll step 13/13"; auto result = current_promise(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2).AtLocation(whence.file(), whence.line()) - << "seq[" << this << "]: poll step 13/13 gets " - << (result.ready() ? "ready" : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + .AtLocation(whence.file(), whence.line()) + << "seq[" << this << "]: poll step 13/13 gets " + << (result.ready() ? "ready" : "pending"); auto* p = result.value_if_ready(); if (p == nullptr) return Pending{}; return Result(std::move(*p)); diff --git a/deps/grpc/src/core/lib/promise/detail/status.h b/deps/grpc/src/core/lib/promise/detail/status.h index f1c2aa03d8..42847c6ba6 100644 --- a/deps/grpc/src/core/lib/promise/detail/status.h +++ b/deps/grpc/src/core/lib/promise/detail/status.h @@ -30,12 +30,14 @@ namespace promise_detail { // Convert with a move the input status to an absl::Status. template -absl::Status IntoStatus(absl::StatusOr* status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::Status IntoStatus( + absl::StatusOr* status) { return std::move(status->status()); } // Convert with a move the input status to an absl::Status. -inline absl::Status IntoStatus(absl::Status* status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::Status IntoStatus( + absl::Status* status) { return std::move(*status); } @@ -44,10 +46,14 @@ inline absl::Status IntoStatus(absl::Status* status) { // Return true if the status represented by the argument is ok, false if not. // By implementing this function for other, non-absl::Status types, those types // can participate in TrySeq as result types that affect control flow. -inline bool IsStatusOk(const absl::Status& status) { return status.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const absl::Status& status) { + return status.ok(); +} template -inline bool IsStatusOk(const absl::StatusOr& status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const absl::StatusOr& status) { return status.ok(); } @@ -56,29 +62,38 @@ struct StatusCastImpl; template struct StatusCastImpl { - static To Cast(To&& t) { return std::move(t); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static To Cast(To&& t) { + return std::move(t); + } }; template struct StatusCastImpl { - static To Cast(const To& t) { return t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static To Cast(const To& t) { return t; } }; template struct StatusCastImpl> { - static absl::Status Cast(absl::StatusOr&& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + absl::StatusOr&& t) { return std::move(t.status()); } }; template struct StatusCastImpl&> { - static absl::Status Cast(const absl::StatusOr& t) { return t.status(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + const absl::StatusOr& t) { + return t.status(); + } }; template struct StatusCastImpl&> { - static absl::Status Cast(const absl::StatusOr& t) { return t.status(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + const absl::StatusOr& t) { + return t.status(); + } }; // StatusCast<> allows casting from one status-bearing type to another, @@ -88,7 +103,7 @@ struct StatusCastImpl&> { // For cases where the status is guaranteed to be a failure (and hence not // needing to preserve values) see FailureStatusCast<> below. template -To StatusCast(From&& from) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To StatusCast(From&& from) { return StatusCastImpl::Cast(std::forward(from)); } @@ -97,16 +112,22 @@ struct FailureStatusCastImpl : public StatusCastImpl {}; template struct FailureStatusCastImpl, absl::Status> { - static absl::StatusOr Cast(absl::Status&& t) { return std::move(t); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + absl::Status&& t) { + return std::move(t); + } }; template struct FailureStatusCastImpl, const absl::Status&> { - static absl::StatusOr Cast(const absl::Status& t) { return t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + const absl::Status& t) { + return t; + } }; template -To FailureStatusCast(From&& from) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To FailureStatusCast(From&& from) { DCHECK(!IsStatusOk(from)); return FailureStatusCastImpl::Cast(std::forward(from)); } diff --git a/deps/grpc/src/core/lib/promise/for_each.h b/deps/grpc/src/core/lib/promise/for_each.h index 4aefd1a308..60eb19b713 100644 --- a/deps/grpc/src/core/lib/promise/for_each.h +++ b/deps/grpc/src/core/lib/promise/for_each.h @@ -21,10 +21,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -47,14 +47,17 @@ struct Done; template <> struct Done { - static absl::Status Make(bool cancelled) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Make( + bool cancelled) { return cancelled ? absl::CancelledError() : absl::OkStatus(); } }; template <> struct Done { - static StatusFlag Make(bool cancelled) { return StatusFlag(!cancelled); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static StatusFlag Make(bool cancelled) { + return StatusFlag(!cancelled); + } }; template @@ -70,20 +73,23 @@ template struct NextValueTraits> { using Value = typename T::value_type; - static NextValueType Type(const T& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static NextValueType Type(const T& t) { if (t.has_value()) return NextValueType::kValue; if (t.cancelled()) return NextValueType::kError; return NextValueType::kEndOfStream; } - static Value& MutableValue(T& t) { return *t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Value& MutableValue(T& t) { + return *t; + } }; template struct NextValueTraits>> { using Value = T; - static NextValueType Type(const ValueOrFailure>& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static NextValueType Type( + const ValueOrFailure>& t) { if (t.ok()) { if (t.value().has_value()) return NextValueType::kValue; return NextValueType::kEndOfStream; @@ -91,7 +97,8 @@ struct NextValueTraits>> { return NextValueType::kError; } - static Value& MutableValue(ValueOrFailure>& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Value& MutableValue( + ValueOrFailure>& t) { return **t; } }; @@ -110,13 +117,14 @@ class ForEach { public: using Result = typename PollTraits()())>::Type; - ForEach(Reader reader, Action action, DebugLocation whence = {}) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ForEach(Reader reader, Action action, + DebugLocation whence = {}) : reader_(std::move(reader)), action_factory_(std::move(action)), whence_(whence) { Construct(&reader_next_, reader_.Next()); } - ~ForEach() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~ForEach() { if (reading_next_) { Destruct(&reader_next_); } else { @@ -163,18 +171,14 @@ class ForEach { ":", whence_.line(), "]: "); } - Poll PollReaderNext() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext", DebugTag().c_str()); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollReaderNext() { + GRPC_TRACE_LOG(promise_primitives, INFO) << DebugTag() << " PollReaderNext"; auto r = reader_next_(); if (auto* p = r.value_if_ready()) { switch (NextValueTraits::Type(*p)) { case NextValueType::kValue: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got value", - DebugTag().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << " PollReaderNext: got value"; Destruct(&reader_next_); auto action = action_factory_.Make( std::move(NextValueTraits::MutableValue(*p))); @@ -183,17 +187,13 @@ class ForEach { return PollAction(); } case NextValueType::kEndOfStream: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got end of stream", - DebugTag().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << " PollReaderNext: got end of stream"; return Done::Make(false); } case NextValueType::kError: { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got error", - DebugTag().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << " PollReaderNext: got error"; return Done::Make(true); } } @@ -202,9 +202,7 @@ class ForEach { } Poll PollAction() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollAction", DebugTag().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) << DebugTag() << " PollAction"; auto r = in_action_.promise(); if (auto* p = r.value_if_ready()) { if (IsStatusOk(*p)) { @@ -233,8 +231,8 @@ class ForEach { /// For each item acquired by calling Reader::Next, run the promise Action. template -for_each_detail::ForEach ForEach(Reader reader, Action action, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION for_each_detail::ForEach +ForEach(Reader reader, Action action, DebugLocation whence = {}) { return for_each_detail::ForEach(std::move(reader), std::move(action), whence); } diff --git a/deps/grpc/src/core/lib/promise/if.h b/deps/grpc/src/core/lib/promise/if.h index 9dbef2acc8..ed50744b40 100644 --- a/deps/grpc/src/core/lib/promise/if.h +++ b/deps/grpc/src/core/lib/promise/if.h @@ -33,8 +33,8 @@ namespace grpc_core { namespace promise_detail { template -typename CallPoll::PollResult ChooseIf(CallPoll call_poll, bool result, - T* if_true, F* if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION typename CallPoll::PollResult ChooseIf( + CallPoll call_poll, bool result, T* if_true, F* if_false) { if (result) { auto promise = if_true->Make(); return call_poll(promise); @@ -45,9 +45,8 @@ typename CallPoll::PollResult ChooseIf(CallPoll call_poll, bool result, } template -typename CallPoll::PollResult ChooseIf(CallPoll call_poll, - absl::StatusOr result, T* if_true, - F* if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION typename CallPoll::PollResult ChooseIf( + CallPoll call_poll, absl::StatusOr result, T* if_true, F* if_false) { if (!result.ok()) { return typename CallPoll::PollResult(result.status()); } else if (*result) { @@ -71,12 +70,12 @@ class If { typename PollTraits()())>::Type; public: - If(C condition, T if_true, F if_false) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(C condition, T if_true, F if_false) : state_(Evaluating{ConditionPromise(std::move(condition)), TrueFactory(std::move(if_true)), FalseFactory(std::move(if_false))}) {} - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { return absl::visit(CallPoll{this}, state_); } @@ -95,7 +94,8 @@ class If { If* const self; - PollResult operator()(Evaluating& evaluating) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PollResult + operator()(Evaluating& evaluating) const { static_assert( !kSetState, "shouldn't need to set state coming through the initial branch"); @@ -108,7 +108,8 @@ class If { } template - PollResult operator()(Promise& promise) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PollResult + operator()(Promise& promise) const { auto r = promise(); if (kSetState && r.pending()) { self->state_.template emplace(std::move(promise)); @@ -129,7 +130,8 @@ class If { typename PollTraits()())>::Type; public: - If(bool condition, T if_true, F if_false) : condition_(condition) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(bool condition, T if_true, F if_false) + : condition_(condition) { TrueFactory true_factory(std::move(if_true)); FalseFactory false_factory(std::move(if_false)); if (condition_) { @@ -138,7 +140,7 @@ class If { Construct(&if_false_, false_factory.Make()); } } - ~If() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~If() { if (condition_) { Destruct(&if_true_); } else { @@ -148,21 +150,22 @@ class If { If(const If&) = delete; If& operator=(const If&) = delete; - If(If&& other) noexcept : condition_(other.condition_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(If&& other) noexcept + : condition_(other.condition_) { if (condition_) { Construct(&if_true_, std::move(other.if_true_)); } else { Construct(&if_false_, std::move(other.if_false_)); } } - If& operator=(If&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If& operator=(If&& other) noexcept { if (&other == this) return *this; Destruct(this); Construct(this, std::move(other)); return *this; } - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { #ifndef NDEBUG asan_canary_ = std::make_unique(1 + *asan_canary_); #endif @@ -197,7 +200,8 @@ class If { // This makes it safe to capture lambda arguments in the promise factory by // reference. template -promise_detail::If If(C condition, T if_true, F if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::If If( + C condition, T if_true, F if_false) { return promise_detail::If(std::move(condition), std::move(if_true), std::move(if_false)); } diff --git a/deps/grpc/src/core/lib/promise/inter_activity_latch.h b/deps/grpc/src/core/lib/promise/inter_activity_latch.h index b27b481aad..38ef2a0aa4 100644 --- a/deps/grpc/src/core/lib/promise/inter_activity_latch.h +++ b/deps/grpc/src/core/lib/promise/inter_activity_latch.h @@ -20,9 +20,9 @@ #include #include "absl/base/thread_annotations.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -45,10 +45,8 @@ class InterActivityLatch { auto Wait() { return [this]() -> Poll { MutexLock lock(&mu_); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "PollWait " << StateString(); if (is_set_) { return std::move(value_); } else { @@ -61,9 +59,8 @@ class InterActivityLatch { // Set the latch. void Set(T value) { MutexLock lock(&mu_); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Set " << StateString(); is_set_ = true; value_ = std::move(value); waiters_.WakeupAsync(); @@ -103,10 +100,8 @@ class InterActivityLatch { auto Wait() { return [this]() -> Poll { MutexLock lock(&mu_); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "PollWait " << StateString(); if (is_set_) { return Empty{}; } else { @@ -119,9 +114,8 @@ class InterActivityLatch { // Set the latch. void Set() { MutexLock lock(&mu_); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Set " << StateString(); is_set_ = true; waiters_.WakeupAsync(); } diff --git a/deps/grpc/src/core/lib/promise/interceptor_list.h b/deps/grpc/src/core/lib/promise/interceptor_list.h index fe5bac1a4d..dc9b63d3f8 100644 --- a/deps/grpc/src/core/lib/promise/interceptor_list.h +++ b/deps/grpc/src/core/lib/promise/interceptor_list.h @@ -23,11 +23,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" -#include #include #include "src/core/lib/gprpp/construct_destruct.h" @@ -87,10 +87,8 @@ class InterceptorList { public: RunPromise(size_t memory_required, Map** factory, absl::optional value) { if (!value.has_value() || *factory == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, - "InterceptorList::RunPromise[%p]: create immediate", this); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this << "]: create immediate"; is_immediately_resolved_ = true; Construct(&result_, std::move(value)); } else { @@ -100,18 +98,15 @@ class InterceptorList { async_resolution_.space.get()); async_resolution_.current_factory = *factory; async_resolution_.first_factory = factory; - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, - "InterceptorList::RunPromise[%p]: create async; mem=%p", this, - async_resolution_.space.get()); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this + << "]: create async; mem=" << async_resolution_.space.get(); } } ~RunPromise() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: destroy", this); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this << "]: destroy"; if (is_immediately_resolved_) { Destruct(&result_); } else { @@ -128,10 +123,9 @@ class InterceptorList { RunPromise(RunPromise&& other) noexcept : is_immediately_resolved_(other.is_immediately_resolved_) { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: move from %p", - this, &other); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this << "]: move from " + << &other; if (is_immediately_resolved_) { Construct(&result_, std::move(other.result_)); } else { @@ -142,10 +136,8 @@ class InterceptorList { RunPromise& operator=(RunPromise&& other) noexcept = delete; Poll> operator()() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: %s", this, - DebugString().c_str()); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this << "]: " << DebugString(); if (is_immediately_resolved_) return std::move(result_); while (true) { if (*async_resolution_.first_factory == nullptr) { @@ -160,10 +152,9 @@ class InterceptorList { async_resolution_.current_factory = async_resolution_.current_factory->next(); if (!p->has_value()) async_resolution_.current_factory = nullptr; - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: %s", this, - DebugString().c_str()); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "InterceptorList::RunPromise[" << this + << "]: " << DebugString(); if (async_resolution_.current_factory == nullptr) { return std::move(*p); } @@ -226,15 +217,13 @@ class InterceptorList { // Append a new map to the end of the chain. template void AppendMap(Fn fn, DebugLocation from) { - Append(MakeMapToAdd( - std::move(fn), [] {}, from)); + Append(MakeMapToAdd(std::move(fn), [] {}, from)); } // Prepend a new map to the beginning of the chain. template void PrependMap(Fn fn, DebugLocation from) { - Prepend(MakeMapToAdd( - std::move(fn), [] {}, from)); + Prepend(MakeMapToAdd(std::move(fn), [] {}, from)); } // Append a new map to the end of the chain, with a cleanup function to be diff --git a/deps/grpc/src/core/lib/promise/join.h b/deps/grpc/src/core/lib/promise/join.h index 5c16f65c27..0206baabcc 100644 --- a/deps/grpc/src/core/lib/promise/join.h +++ b/deps/grpc/src/core/lib/promise/join.h @@ -33,11 +33,11 @@ struct JoinTraits { template using ResultType = absl::remove_reference_t; template - static bool IsOk(const T&) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const T&) { return true; } template - static T Unwrapped(T x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T Unwrapped(T x) { return x; } template @@ -45,7 +45,8 @@ struct JoinTraits { abort(); } template - static std::tuple FinalReturn(A... a) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static std::tuple FinalReturn( + A... a) { return std::make_tuple(std::move(a)...); } }; @@ -53,8 +54,11 @@ struct JoinTraits { template class Join { public: - explicit Join(Promises... promises) : state_(std::move(promises)...) {} - auto operator()() { return state_.PollOnce(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Join(Promises... promises) + : state_(std::move(promises)...) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() { + return state_.PollOnce(); + } private: JoinState state_; @@ -62,7 +66,7 @@ class Join { struct WrapInTuple { template - std::tuple operator()(T x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION std::tuple operator()(T x) { return std::make_tuple(std::move(x)); } }; @@ -72,12 +76,13 @@ struct WrapInTuple { /// Combinator to run all promises to completion, and return a tuple /// of their results. template -promise_detail::Join Join(Promise... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Join Join( + Promise... promises) { return promise_detail::Join(std::move(promises)...); } template -auto Join(F promise) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto Join(F promise) { return Map(std::move(promise), promise_detail::WrapInTuple{}); } diff --git a/deps/grpc/src/core/lib/promise/latch.h b/deps/grpc/src/core/lib/promise/latch.h index 5504d10f13..10f4776117 100644 --- a/deps/grpc/src/core/lib/promise/latch.h +++ b/deps/grpc/src/core/lib/promise/latch.h @@ -22,9 +22,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -67,10 +67,8 @@ class Latch { has_had_waiters_ = true; #endif return [this]() -> Poll { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sWait %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Wait " << StateString(); if (has_value_) { return std::move(value_); } else { @@ -86,10 +84,8 @@ class Latch { has_had_waiters_ = true; #endif return [this]() -> Poll { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sWaitAndCopy %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "WaitAndCopy " << StateString(); if (has_value_) { return value_; } else { @@ -100,9 +96,8 @@ class Latch { // Set the value of the latch. Can only be called once. void Set(T value) { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Set " << StateString(); DCHECK(!has_value_); value_ = std::move(value); has_value_ = true; @@ -163,10 +158,8 @@ class Latch { has_had_waiters_ = true; #endif return [this]() -> Poll { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "PollWait " << StateString(); if (is_set_) { return Empty{}; } else { @@ -177,9 +170,8 @@ class Latch { // Set the latch. Can only be called once. void Set() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Set " << StateString(); DCHECK(!is_set_); is_set_ = true; waiter_.Wake(); @@ -226,10 +218,8 @@ class ExternallyObservableLatch { // Produce a promise to wait for this latch. auto Wait() { return [this]() -> Poll { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "PollWait " << StateString(); if (IsSet()) { return Empty{}; } else { @@ -240,9 +230,8 @@ class ExternallyObservableLatch { // Set the latch. void Set() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Set " << StateString(); is_set_.store(true, std::memory_order_relaxed); waiter_.Wake(); } @@ -250,10 +239,8 @@ class ExternallyObservableLatch { bool IsSet() const { return is_set_.load(std::memory_order_relaxed); } void Reset() { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sReset %s", DebugTag().c_str(), - StateString().c_str()); - } + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "Reset " << StateString(); is_set_.store(false, std::memory_order_relaxed); } diff --git a/deps/grpc/src/core/lib/promise/loop.h b/deps/grpc/src/core/lib/promise/loop.h index 8b4f99286d..acfabce2e7 100644 --- a/deps/grpc/src/core/lib/promise/loop.h +++ b/deps/grpc/src/core/lib/promise/loop.h @@ -46,13 +46,17 @@ struct LoopTraits; template struct LoopTraits> { using Result = T; - static LoopCtl ToLoopCtl(LoopCtl value) { return value; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( + LoopCtl value) { + return value; + } }; template struct LoopTraits>> { using Result = absl::StatusOr; - static LoopCtl ToLoopCtl(absl::StatusOr> value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( + absl::StatusOr> value) { if (!value.ok()) return value.status(); auto& inner = *value; if (absl::holds_alternative(inner)) return Continue{}; @@ -63,7 +67,7 @@ struct LoopTraits>> { template <> struct LoopTraits>> { using Result = absl::Status; - static LoopCtl ToLoopCtl( + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( absl::StatusOr> value) { if (!value.ok()) return value.status(); const auto& inner = *value; @@ -82,12 +86,13 @@ class Loop { public: using Result = typename LoopTraits::Result; - explicit Loop(F f) : factory_(std::move(f)) {} - ~Loop() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Loop(F f) + : factory_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Loop() { if (started_) Destruct(&promise_); } - Loop(Loop&& loop) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Loop(Loop&& loop) noexcept : factory_(std::move(loop.factory_)), started_(loop.started_) { if (started_) Construct(&promise_, std::move(loop.promise_)); } @@ -95,7 +100,7 @@ class Loop { Loop(const Loop& loop) = delete; Loop& operator=(const Loop& loop) = delete; - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { if (!started_) { started_ = true; Construct(&promise_, factory_.Make()); @@ -136,7 +141,7 @@ class Loop { // Expects F returns LoopCtl - if it's Continue, then run the loop again - // otherwise yield the returned value as the result of the loop. template -promise_detail::Loop Loop(F f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Loop Loop(F f) { return promise_detail::Loop(std::move(f)); } diff --git a/deps/grpc/src/core/lib/promise/map.h b/deps/grpc/src/core/lib/promise/map.h index b1772ad5b5..3ba8c19c2f 100644 --- a/deps/grpc/src/core/lib/promise/map.h +++ b/deps/grpc/src/core/lib/promise/map.h @@ -35,7 +35,7 @@ namespace promise_detail { template class Map { public: - Map(Promise promise, Fn fn) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Map(Promise promise, Fn fn) : promise_(std::move(promise)), fn_(std::move(fn)) {} Map(const Map&) = delete; @@ -49,7 +49,7 @@ class Map { using Result = RemoveCVRef()(std::declval()))>; - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { Poll r = promise_(); if (auto* p = r.value_if_ready()) { return fn_(std::move(*p)); @@ -68,7 +68,8 @@ class Map { // Takes a promise, and a synchronous function to mutate its result, and // returns a promise. template -promise_detail::Map Map(Promise promise, Fn fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Map Map( + Promise promise, Fn fn) { return promise_detail::Map(std::move(promise), std::move(fn)); } @@ -76,7 +77,7 @@ promise_detail::Map Map(Promise promise, Fn fn) { // and a bool indicating whether there was ever a Pending{} value observed from // polling. template -auto CheckDelayed(Promise promise) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto CheckDelayed(Promise promise) { using P = promise_detail::PromiseLike; return [delayed = false, promise = P(std::move(promise))]() mutable -> Poll> { @@ -85,7 +86,7 @@ auto CheckDelayed(Promise promise) { delayed = true; return Pending{}; } - return std::make_tuple(r.value(), delayed); + return std::make_tuple(std::move(r.value()), delayed); }; } @@ -93,13 +94,13 @@ auto CheckDelayed(Promise promise) { template struct JustElem { template - auto operator()(std::tuple&& t) const - -> decltype(std::get(std::forward>(t))) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()(std::tuple&& t) + const -> decltype(std::get(std::forward>(t))) { return std::get(std::forward>(t)); } template - auto operator()(const std::tuple& t) const - -> decltype(std::get(t)) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()( + const std::tuple& t) const -> decltype(std::get(t)) { return std::get(t); } }; diff --git a/deps/grpc/src/core/lib/promise/map_pipe.h b/deps/grpc/src/core/lib/promise/map_pipe.h index e2dc6a9ee6..2915a9376b 100644 --- a/deps/grpc/src/core/lib/promise/map_pipe.h +++ b/deps/grpc/src/core/lib/promise/map_pipe.h @@ -18,7 +18,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" -#include #include #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/deps/grpc/src/core/lib/promise/mpsc.h b/deps/grpc/src/core/lib/promise/mpsc.h index ec8132e843..4df3e61a51 100644 --- a/deps/grpc/src/core/lib/promise/mpsc.h +++ b/deps/grpc/src/core/lib/promise/mpsc.h @@ -18,13 +18,14 @@ #include #include +#include +#include #include #include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" -#include #include #include "src/core/lib/gprpp/ref_counted.h" @@ -48,6 +49,9 @@ class Center : public RefCounted> { // Construct the center with a maximum queue size. explicit Center(size_t max_queued) : max_queued_(max_queued) {} + static constexpr const uint64_t kClosedBatch = + std::numeric_limits::max(); + // Poll for new items. // - Returns true if new items were obtained, in which case they are contained // in dest in the order they were added. Wakes up all pending senders since @@ -67,45 +71,39 @@ class Center : public RefCounted> { } dest.swap(queue_); queue_.clear(); + if (batch_ != kClosedBatch) ++batch_; auto wakeups = send_wakers_.TakeWakeupSet(); lock.Release(); wakeups.Wakeup(); return true; } - // Poll to send one item. - // Returns pending if no send slot was available. - // Returns true if the item was sent. - // Returns false if the receiver has been closed. - Poll PollSend(T& t) { - ReleasableMutexLock lock(&mu_); - if (receiver_closed_) return Poll(false); - if (queue_.size() < max_queued_) { - queue_.push_back(std::move(t)); - auto receive_waker = std::move(receive_waker_); - lock.Release(); - receive_waker.Wakeup(); - return Poll(true); - } - send_wakers_.AddPending(GetContext()->MakeNonOwningWaker()); - return Pending{}; - } - - bool ImmediateSend(T t) { + // Returns the batch number that the item was sent in, or kClosedBatch if the + // pipe is closed. + uint64_t Send(T t) { ReleasableMutexLock lock(&mu_); - if (receiver_closed_) return false; + if (batch_ == kClosedBatch) return kClosedBatch; queue_.push_back(std::move(t)); auto receive_waker = std::move(receive_waker_); + const uint64_t batch = queue_.size() <= max_queued_ ? batch_ : batch_ + 1; lock.Release(); receive_waker.Wakeup(); - return true; + return batch; + } + + // Poll until a particular batch number is received. + Poll PollReceiveBatch(uint64_t batch) { + ReleasableMutexLock lock(&mu_); + if (batch_ >= batch) return Empty{}; + send_wakers_.AddPending(GetContext()->MakeNonOwningWaker()); + return Pending{}; } // Mark that the receiver is closed. void ReceiverClosed() { ReleasableMutexLock lock(&mu_); - if (receiver_closed_) return; - receiver_closed_ = true; + if (batch_ == kClosedBatch) return; + batch_ = kClosedBatch; auto wakeups = send_wakers_.TakeWakeupSet(); lock.Release(); wakeups.Wakeup(); @@ -115,7 +113,9 @@ class Center : public RefCounted> { Mutex mu_; const size_t max_queued_; std::vector queue_ ABSL_GUARDED_BY(mu_); - bool receiver_closed_ ABSL_GUARDED_BY(mu_) = false; + // Every time we give queue_ to the receiver, we increment batch_. + // When the receiver is closed we set batch_ to kClosedBatch. + uint64_t batch_ ABSL_GUARDED_BY(mu_) = 1; Waker receive_waker_ ABSL_GUARDED_BY(mu_); WaitSet send_wakers_ ABSL_GUARDED_BY(mu_); }; @@ -138,14 +138,23 @@ class MpscSender { // Resolves to true if sent, false if the receiver was closed (and the value // will never be successfully sent). auto Send(T t) { - return [center = center_, t = std::move(t)]() mutable -> Poll { + return [center = center_, t = std::move(t), + batch = uint64_t(0)]() mutable -> Poll { if (center == nullptr) return false; - return center->PollSend(t); + if (batch == 0) { + batch = center->Send(std::move(t)); + CHECK_NE(batch, 0u); + if (batch == mpscpipe_detail::Center::kClosedBatch) return false; + } + auto p = center->PollReceiveBatch(batch); + if (p.pending()) return Pending{}; + return true; }; } bool UnbufferedImmediateSend(T t) { - return center_->ImmediateSend(std::move(t)); + return center_->Send(std::move(t)) != + mpscpipe_detail::Center::kClosedBatch; } private: diff --git a/deps/grpc/src/core/lib/promise/party.cc b/deps/grpc/src/core/lib/promise/party.cc index ae80f5abfa..b8b6a899a4 100644 --- a/deps/grpc/src/core/lib/promise/party.cc +++ b/deps/grpc/src/core/lib/promise/party.cc @@ -15,17 +15,20 @@ #include "src/core/lib/promise/party.h" #include +#include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include #include +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" +#include "src/core/util/latent_see.h" #ifdef GRPC_MAXIMIZE_THREADYNESS #include "src/core/lib/gprpp/thd.h" // IWYU pragma: keep @@ -34,15 +37,10 @@ namespace grpc_core { -namespace { -// TODO(ctiller): Once all activities are parties we can remove this. -thread_local Party** g_current_party_run_next = nullptr; -} // namespace - /////////////////////////////////////////////////////////////////////////////// // PartySyncUsingAtomics -GRPC_MUST_USE_RESULT bool PartySyncUsingAtomics::RefIfNonZero() { +GRPC_MUST_USE_RESULT bool Party::RefIfNonZero() { auto count = state_.load(std::memory_order_relaxed); do { // If zero, we are done (without an increment). If not, we must do a CAS @@ -58,33 +56,6 @@ GRPC_MUST_USE_RESULT bool PartySyncUsingAtomics::RefIfNonZero() { return true; } -bool PartySyncUsingAtomics::UnreffedLast() { - uint64_t prev_state = - state_.fetch_or(kDestroying | kLocked, std::memory_order_acq_rel); - LogStateChange("UnreffedLast", prev_state, - prev_state | kDestroying | kLocked); - return (prev_state & kLocked) == 0; -} - -bool PartySyncUsingAtomics::ScheduleWakeup(WakeupMask mask) { - // Or in the wakeup bit for the participant, AND the locked bit. - uint64_t prev_state = state_.fetch_or((mask & kWakeupMask) | kLocked, - std::memory_order_acq_rel); - LogStateChange("ScheduleWakeup", prev_state, - prev_state | (mask & kWakeupMask) | kLocked); - // If the lock was not held now we hold it, so we need to run. - return ((prev_state & kLocked) == 0); -} - -/////////////////////////////////////////////////////////////////////////////// -// PartySyncUsingMutex - -bool PartySyncUsingMutex::ScheduleWakeup(WakeupMask mask) { - MutexLock lock(&mu_); - wakeups_ |= mask; - return !std::exchange(locked_, true); -} - /////////////////////////////////////////////////////////////////////////////// // Party::Handle @@ -178,7 +149,9 @@ Party::Participant::~Participant() { Party::~Party() {} void Party::CancelRemainingParticipants() { + if ((state_.load(std::memory_order_relaxed) & kAllocatedMask) == 0) return; ScopedActivity activity(this); + promise_detail::Context arena_ctx(arena_.get()); for (size_t i = 0; i < party_detail::kMaxParticipants; i++) { if (auto* p = participants_[i].exchange(nullptr, std::memory_order_acquire)) { @@ -207,139 +180,309 @@ Waker Party::MakeNonOwningWaker() { void Party::ForceImmediateRepoll(WakeupMask mask) { DCHECK(is_current()); - sync_.ForceImmediateRepoll(mask); + wakeup_mask_ |= mask; } -void Party::RunLocked() { - // If there is a party running, then we don't run it immediately - // but instead add it to the end of the list of parties to run. - // This enables a fairly straightforward batching of work from a - // call to a transport (or back again). - if (g_current_party_run_next != nullptr) { - if (*g_current_party_run_next == nullptr) { - *g_current_party_run_next = this; - } else { - // But if there's already a party queued, we're better off asking event - // engine to run it so we can spread load. - event_engine()->Run([this]() { - ApplicationCallbackExecCtx app_exec_ctx; - ExecCtx exec_ctx; - RunLocked(); - }); - } - return; - } - auto body = [this]() { - DCHECK_EQ(g_current_party_run_next, nullptr); - Party* run_next = nullptr; - g_current_party_run_next = &run_next; - const bool done = RunParty(); - DCHECK(g_current_party_run_next == &run_next); - g_current_party_run_next = nullptr; - if (done) { - ScopedActivity activity(this); - PartyOver(); - } - if (run_next != nullptr) { - run_next->RunLocked(); - } - }; +void Party::RunLockedAndUnref(Party* party, uint64_t prev_state) { + GRPC_LATENT_SEE_PARENT_SCOPE("Party::RunLocked"); #ifdef GRPC_MAXIMIZE_THREADYNESS Thread thd( "RunParty", - [body]() { + [party, prev_state]() { ApplicationCallbackExecCtx app_exec_ctx; ExecCtx exec_ctx; - body(); + party->RunPartyAndUnref(prev_state); }, nullptr, Thread::Options().set_joinable(false)); thd.Start(); #else - body(); + struct RunState; + static thread_local RunState* g_run_state = nullptr; + struct PartyWakeup { + PartyWakeup() : party{nullptr} {} + PartyWakeup(Party* party, uint64_t prev_state) + : party{party}, prev_state{prev_state} {} + Party* party; + uint64_t prev_state; + }; + struct RunState { + explicit RunState(PartyWakeup first) : first{first}, next{} {} + PartyWakeup first; + PartyWakeup next; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Run() { + g_run_state = this; + do { + GRPC_LATENT_SEE_INNER_SCOPE("run_one_party"); + first.party->RunPartyAndUnref(first.prev_state); + first = std::exchange(next, PartyWakeup{}); + } while (first.party != nullptr); + DCHECK(g_run_state == this); + g_run_state = nullptr; + } + }; + // If there is a party running, then we don't run it immediately + // but instead add it to the end of the list of parties to run. + // This enables a fairly straightforward batching of work from a + // call to a transport (or back again). + if (GPR_UNLIKELY(g_run_state != nullptr)) { + if (g_run_state->first.party == party) { + g_run_state->first.prev_state = prev_state; + party->Unref(); + return; + } + if (g_run_state->next.party == party) { + g_run_state->next.prev_state = prev_state; + party->Unref(); + return; + } + if (g_run_state->next.party != nullptr) { + // If there's already a different party queued, we're better off asking + // event engine to run it so we can spread load. + // We swap the oldest party to run on the event engine so that we don't + // accidentally end up with a tail latency problem whereby one party + // gets held for a really long time. + auto wakeup = + std::exchange(g_run_state->next, PartyWakeup{party, prev_state}); + party->arena_->GetContext() + ->Run([wakeup]() { + GRPC_LATENT_SEE_PARENT_SCOPE("Party::RunLocked offload"); + ApplicationCallbackExecCtx app_exec_ctx; + ExecCtx exec_ctx; + RunState{wakeup}.Run(); + }); + return; + } + g_run_state->next = PartyWakeup{party, prev_state}; + return; + } + RunState{{party, prev_state}}.Run(); #endif } -bool Party::RunParty() { +void Party::RunPartyAndUnref(uint64_t prev_state) { ScopedActivity activity(this); - return sync_.RunParty([this](int i) { return RunOneParticipant(i); }); -} - -bool Party::RunOneParticipant(int i) { - // If the participant is null, skip. - // This allows participants to complete whilst wakers still exist - // somewhere. - auto* participant = participants_[i].load(std::memory_order_acquire); - if (participant == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s[party] wakeup %d already complete", - DebugTag().c_str(), i); - } - return false; - } - absl::string_view name; - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - name = participant->name(); - gpr_log(GPR_INFO, "%s[%s] begin job %d", DebugTag().c_str(), - std::string(name).c_str(), i); + promise_detail::Context arena_ctx(arena_.get()); + DCHECK_EQ(prev_state & kLocked, 0u) + << "Party should be unlocked prior to first wakeup"; + DCHECK_GE(prev_state & kRefMask, kOneRef); + // Now update prev_state to be what we want the CAS to see below. + DCHECK_EQ(prev_state & ~(kRefMask | kAllocatedMask), 0u) + << "Party should have contained no wakeups on lock"; + prev_state |= kLocked; + absl::optional time_cache; +#if !TARGET_OS_IPHONE + if (IsTimeCachingInPartyEnabled()) { + time_cache.emplace(); } - // Poll the participant. - currently_polling_ = i; - bool done = participant->PollParticipantPromise(); - currently_polling_ = kNotPolling; - if (done) { - if (!name.empty()) { - GRPC_TRACE_LOG(promise_primitives, INFO) - << DebugTag() << "[" << name << "] end poll and finish job " << i; +#endif + for (;;) { + uint64_t keep_allocated_mask = kAllocatedMask; + // For each wakeup bit... + while (wakeup_mask_ != 0) { + auto wakeup_mask = std::exchange(wakeup_mask_, 0); + while (wakeup_mask != 0) { + const uint64_t t = LowestOneBit(wakeup_mask); + const int i = absl::countr_zero(t); + wakeup_mask ^= t; + // If the participant is null, skip. + // This allows participants to complete whilst wakers still exist + // somewhere. + auto* participant = participants_[i].load(std::memory_order_acquire); + if (GPR_UNLIKELY(participant == nullptr)) { + GRPC_TRACE_LOG(promise_primitives, INFO) + << "Party " << this << " Run:Wakeup " << i + << " already complete"; + continue; + } + GRPC_TRACE_LOG(promise_primitives, INFO) + << "Party " << this << " Run:Wakeup " << i; + // Poll the participant. + currently_polling_ = i; + if (participant->PollParticipantPromise()) { + participants_[i].store(nullptr, std::memory_order_relaxed); + const uint64_t allocated_bit = (1u << i << kAllocatedShift); + keep_allocated_mask &= ~allocated_bit; + } + } } - participants_[i].store(nullptr, std::memory_order_relaxed); - } else if (!name.empty()) { - GRPC_TRACE_LOG(promise_primitives, INFO) - << DebugTag() << "[" << name << "] end poll"; + currently_polling_ = kNotPolling; + // Try to CAS the state we expected to have (with no wakeups or adds) + // back to unlocked (by masking in only the ref mask - sans locked bit). + // If this succeeds then no wakeups were added, no adds were added, and we + // have successfully unlocked. + // Otherwise, we need to loop again. + // Note that if an owning waker is created or the weak cas spuriously + // fails we will also loop again, but in that case see no wakeups or adds + // and so will get back here fairly quickly. + // TODO(ctiller): consider mitigations for the accidental wakeup on owning + // waker creation case -- I currently expect this will be more expensive + // than this quick loop. + if (state_.compare_exchange_weak( + prev_state, + (prev_state & (kRefMask | keep_allocated_mask)) - kOneRef, + std::memory_order_acq_rel, std::memory_order_acquire)) { + LogStateChange("Run:End", prev_state, + prev_state & (kRefMask | kAllocatedMask) - kOneRef); + if ((prev_state & kRefMask) == kOneRef) { + // We're done with the party. + PartyIsOver(); + } + return; + } + // CAS out (but retrieve) any allocations and wakeups that occurred during + // the run. + while (!state_.compare_exchange_weak( + prev_state, prev_state & (kRefMask | kLocked | keep_allocated_mask))) { + // Nothing to do here. + } + LogStateChange("Run:Continue", prev_state, + prev_state & (kRefMask | kLocked | keep_allocated_mask)); + DCHECK(prev_state & kLocked) + << "Party should be locked; prev_state=" << prev_state; + DCHECK_GE(prev_state & kRefMask, kOneRef); + // From the previous state, extract which participants we're to wakeup. + wakeup_mask_ |= prev_state & kWakeupMask; + // Now update prev_state to be what we want the CAS to see once wakeups + // complete next iteration. + prev_state &= kRefMask | kLocked | keep_allocated_mask; } - return done; } void Party::AddParticipants(Participant** participants, size_t count) { - bool run_party = sync_.AddParticipantsAndRef(count, [this, participants, - count](size_t* slots) { + uint64_t state = state_.load(std::memory_order_acquire); + uint64_t allocated; + + size_t slots[party_detail::kMaxParticipants]; + + // Find slots for each new participant, ordering them from lowest available + // slot upwards to ensure the same poll ordering as presentation ordering to + // this function. + WakeupMask wakeup_mask; + uint64_t new_state; + do { + wakeup_mask = 0; + allocated = (state & kAllocatedMask) >> kAllocatedShift; for (size_t i = 0; i < count; i++) { - if (GRPC_TRACE_FLAG_ENABLED(party_state)) { - gpr_log(GPR_INFO, - "Party %p AddParticipant: %s @ %" PRIdPTR - " [participant=%p]", - &sync_, std::string(participants[i]->name()).c_str(), slots[i], - participants[i]); + auto new_mask = LowestOneBit(~allocated); + if (GPR_UNLIKELY((new_mask & kWakeupMask) == 0)) { + DelayAddParticipants(participants, count); + return; } - participants_[slots[i]].store(participants[i], std::memory_order_release); + wakeup_mask |= new_mask; + allocated |= new_mask; + slots[i] = absl::countr_zero(new_mask); + } + // Try to allocate this slot and take a ref (atomically). + // Ref needs to be taken because once we store the participant it could be + // spuriously woken up and unref the party. + new_state = (state | (allocated << kAllocatedShift)) + kOneRef; + } while (!state_.compare_exchange_weak( + state, new_state, std::memory_order_acq_rel, std::memory_order_acquire)); + LogStateChange("AddParticipantsAndRef", state, new_state); + + for (size_t i = 0; i < count; i++) { + GRPC_TRACE_LOG(party_state, INFO) + << "Party " << this << " AddParticipant: " << slots[i] + << " " << participants[i]; + participants_[slots[i]].store(participants[i], std::memory_order_release); + } + + // Now we need to wake up the party. + WakeupFromState(new_state, wakeup_mask); +} + +void Party::AddParticipant(Participant* participant) { + uint64_t state = state_.load(std::memory_order_acquire); + uint64_t allocated; + size_t slot; + + // Find slots for each new participant, ordering them from lowest available + // slot upwards to ensure the same poll ordering as presentation ordering to + // this function. + uint64_t wakeup_mask; + uint64_t new_state; + do { + allocated = (state & kAllocatedMask) >> kAllocatedShift; + wakeup_mask = LowestOneBit(~allocated); + if (GPR_UNLIKELY((wakeup_mask & kWakeupMask) == 0)) { + DelayAddParticipants(&participant, 1); + return; } - }); - if (run_party) RunLocked(); - Unref(); + DCHECK_NE(wakeup_mask & kWakeupMask, 0u) + << "No available slots for new participant; allocated=" << allocated + << " state=" << state << " wakeup_mask=" << wakeup_mask; + allocated |= wakeup_mask; + slot = absl::countr_zero(wakeup_mask); + // Try to allocate this slot and take a ref (atomically). + // Ref needs to be taken because once we store the participant it could be + // spuriously woken up and unref the party. + new_state = (state | (allocated << kAllocatedShift)) + kOneRef; + } while (!state_.compare_exchange_weak( + state, new_state, std::memory_order_acq_rel, std::memory_order_acquire)); + LogStateChange("AddParticipantsAndRef", state, new_state); + GRPC_TRACE_LOG(party_state, INFO) + << "Party " << this << " AddParticipant: " << slot + << " [participant=" << participant << "]"; + participants_[slot].store(participant, std::memory_order_release); + // Now we need to wake up the party. + WakeupFromState(new_state, wakeup_mask); } -void Party::Wakeup(WakeupMask wakeup_mask) { - if (sync_.ScheduleWakeup(wakeup_mask)) RunLocked(); - Unref(); +void Party::DelayAddParticipants(Participant** participants, size_t count) { + // We need to delay the addition of participants. + IncrementRefCount(); + VLOG_EVERY_N_SEC(2, 10) << "Delaying addition of " << count + << " participants to party " << this + << " because it is full."; + std::vector delayed_participants{participants, + participants + count}; + arena_->GetContext()->Run( + [this, delayed_participants = std::move(delayed_participants)]() mutable { + ApplicationCallbackExecCtx app_exec_ctx; + ExecCtx exec_ctx; + AddParticipants(delayed_participants.data(), + delayed_participants.size()); + Unref(); + }); } void Party::WakeupAsync(WakeupMask wakeup_mask) { - if (sync_.ScheduleWakeup(wakeup_mask)) { - event_engine()->Run([this]() { - ApplicationCallbackExecCtx app_exec_ctx; - ExecCtx exec_ctx; - RunLocked(); - Unref(); - }); - } else { - Unref(); + // Or in the wakeup bit for the participant, AND the locked bit. + uint64_t prev_state = state_.load(std::memory_order_relaxed); + LogStateChange("ScheduleWakeup", prev_state, + prev_state | (wakeup_mask & kWakeupMask) | kLocked); + while (true) { + if ((prev_state & kLocked) == 0) { + if (state_.compare_exchange_weak(prev_state, prev_state | kLocked, + std::memory_order_acq_rel, + std::memory_order_acquire)) { + LogStateChange("WakeupAsync", prev_state, prev_state | kLocked); + wakeup_mask_ |= wakeup_mask; + arena_->GetContext()->Run( + [this, prev_state]() { + ApplicationCallbackExecCtx app_exec_ctx; + ExecCtx exec_ctx; + RunLockedAndUnref(this, prev_state); + }); + return; + } + } else { + if (state_.compare_exchange_weak( + prev_state, (prev_state | wakeup_mask) - kOneRef, + std::memory_order_acq_rel, std::memory_order_acquire)) { + LogStateChange("WakeupAsync", prev_state, prev_state | wakeup_mask); + return; + } + } } } void Party::Drop(WakeupMask) { Unref(); } void Party::PartyIsOver() { - ScopedActivity activity(this); - PartyOver(); + CancelRemainingParticipants(); + auto arena = std::move(arena_); + this->~Party(); } } // namespace grpc_core diff --git a/deps/grpc/src/core/lib/promise/party.h b/deps/grpc/src/core/lib/promise/party.h index 6a1894ff2b..b42c392d51 100644 --- a/deps/grpc/src/core/lib/promise/party.h +++ b/deps/grpc/src/core/lib/promise/party.h @@ -25,10 +25,10 @@ #include "absl/base/attributes.h" #include "absl/base/thread_annotations.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -41,25 +41,8 @@ #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" - -// Two implementations of party synchronization are provided: one using a single -// atomic, the other using a mutex and a set of state variables. -// Originally the atomic implementation was implemented, but we found some race -// conditions on Arm that were not reported by our default TSAN implementation. -// The mutex implementation was added to see if it would fix the problem, and -// it did. Later we found the race condition, so there's no known reason to use -// the mutex version - however we keep it around as a just in case measure. -// There's a thought of fuzzing the two implementations against each other as -// a correctness check of both, but that's not implemented yet. - -#define GRPC_PARTY_SYNC_USING_ATOMICS -// #define GRPC_PARTY_SYNC_USING_MUTEX - -#if defined(GRPC_PARTY_SYNC_USING_ATOMICS) + \ - defined(GRPC_PARTY_SYNC_USING_MUTEX) != \ - 1 -#error Must define a party sync mechanism -#endif +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/useful.h" namespace grpc_core { @@ -71,272 +54,6 @@ static constexpr size_t kMaxParticipants = 16; } // namespace party_detail -class PartySyncUsingAtomics { - public: - explicit PartySyncUsingAtomics(size_t initial_refs) - : state_(kOneRef * initial_refs) {} - - void IncrementRefCount() { - const uint64_t prev_state = - state_.fetch_add(kOneRef, std::memory_order_relaxed); - LogStateChange("IncrementRefCount", prev_state, prev_state + kOneRef); - } - GRPC_MUST_USE_RESULT bool RefIfNonZero(); - // Returns true if the ref count is now zero and the caller should call - // PartyOver - GRPC_MUST_USE_RESULT bool Unref() { - const uint64_t prev_state = - state_.fetch_sub(kOneRef, std::memory_order_acq_rel); - LogStateChange("Unref", prev_state, prev_state - kOneRef); - if ((prev_state & kRefMask) == kOneRef) { - return UnreffedLast(); - } - return false; - } - void ForceImmediateRepoll(WakeupMask mask) { - // Or in the bit for the currently polling participant. - // Will be grabbed next round to force a repoll of this promise. - const uint64_t prev_state = - state_.fetch_or(mask, std::memory_order_relaxed); - LogStateChange("ForceImmediateRepoll", prev_state, prev_state | mask); - } - - // Run the update loop: poll_one_participant is called with an integral index - // for the participant that should be polled. It should return true if the - // participant completed and should be removed from the allocated set. - template - GRPC_MUST_USE_RESULT bool RunParty(F poll_one_participant) { - uint64_t prev_state; - iteration_.fetch_add(1, std::memory_order_relaxed); - for (;;) { - // Grab the current state, and clear the wakeup bits & add flag. - prev_state = state_.fetch_and(kRefMask | kLocked | kAllocatedMask, - std::memory_order_acquire); - LogStateChange("Run", prev_state, - prev_state & (kRefMask | kLocked | kAllocatedMask)); - CHECK(prev_state & kLocked); - if (prev_state & kDestroying) return true; - // From the previous state, extract which participants we're to wakeup. - uint64_t wakeups = prev_state & kWakeupMask; - // Now update prev_state to be what we want the CAS to see below. - prev_state &= kRefMask | kLocked | kAllocatedMask; - // For each wakeup bit... - for (size_t i = 0; wakeups != 0; i++, wakeups >>= 1) { - // If the bit is not set, skip. - if ((wakeups & 1) == 0) continue; - if (poll_one_participant(i)) { - const uint64_t allocated_bit = (1u << i << kAllocatedShift); - prev_state &= ~allocated_bit; - uint64_t finished_prev_state = - state_.fetch_and(~allocated_bit, std::memory_order_release); - LogStateChange("Run:ParticipantComplete", finished_prev_state, - finished_prev_state & ~allocated_bit); - } - } - // Try to CAS the state we expected to have (with no wakeups or adds) - // back to unlocked (by masking in only the ref mask - sans locked bit). - // If this succeeds then no wakeups were added, no adds were added, and we - // have successfully unlocked. - // Otherwise, we need to loop again. - // Note that if an owning waker is created or the weak cas spuriously - // fails we will also loop again, but in that case see no wakeups or adds - // and so will get back here fairly quickly. - // TODO(ctiller): consider mitigations for the accidental wakeup on owning - // waker creation case -- I currently expect this will be more expensive - // than this quick loop. - if (wake_after_poll_ == 0) { - if (state_.compare_exchange_weak( - prev_state, (prev_state & (kRefMask | kAllocatedMask)), - std::memory_order_acq_rel, std::memory_order_acquire)) { - LogStateChange("Run:End", prev_state, - prev_state & (kRefMask | kAllocatedMask)); - return false; - } - } else { - if (state_.compare_exchange_weak( - prev_state, - (prev_state & (kRefMask | kAllocatedMask | kLocked)) | - wake_after_poll_, - std::memory_order_acq_rel, std::memory_order_acquire)) { - LogStateChange("Run:EndIteration", prev_state, - prev_state & (kRefMask | kAllocatedMask)); - iteration_.fetch_add(1, std::memory_order_relaxed); - wake_after_poll_ = 0; - } - } - } - return false; - } - - // Add new participants to the party. Returns true if the caller should run - // the party. store is called with an array of indices of the new - // participants. Adds a ref that should be dropped by the caller after - // RunParty has been called (if that was required). - template - GRPC_MUST_USE_RESULT bool AddParticipantsAndRef(size_t count, F store) { - uint64_t state = state_.load(std::memory_order_acquire); - uint64_t allocated; - - size_t slots[party_detail::kMaxParticipants]; - - // Find slots for each new participant, ordering them from lowest available - // slot upwards to ensure the same poll ordering as presentation ordering to - // this function. - WakeupMask wakeup_mask; - do { - wakeup_mask = 0; - allocated = (state & kAllocatedMask) >> kAllocatedShift; - size_t n = 0; - for (size_t bit = 0; n < count && bit < party_detail::kMaxParticipants; - bit++) { - if (allocated & (1 << bit)) continue; - wakeup_mask |= (1 << bit); - slots[n++] = bit; - allocated |= 1 << bit; - } - CHECK(n == count); - // Try to allocate this slot and take a ref (atomically). - // Ref needs to be taken because once we store the participant it could be - // spuriously woken up and unref the party. - } while (!state_.compare_exchange_weak( - state, (state | (allocated << kAllocatedShift)) + kOneRef, - std::memory_order_acq_rel, std::memory_order_acquire)); - LogStateChange("AddParticipantsAndRef", state, - (state | (allocated << kAllocatedShift)) + kOneRef); - - store(slots); - - // Now we need to wake up the party. - state = state_.fetch_or(wakeup_mask | kLocked, std::memory_order_release); - LogStateChange("AddParticipantsAndRef:Wakeup", state, - state | wakeup_mask | kLocked); - - // If the party was already locked, we're done. - return ((state & kLocked) == 0); - } - - // Schedule a wakeup for the given participant. - // Returns true if the caller should run the party. - GRPC_MUST_USE_RESULT bool ScheduleWakeup(WakeupMask mask); - - void WakeAfterPoll(WakeupMask mask) { wake_after_poll_ |= mask; } - uint32_t iteration() const { - return iteration_.load(std::memory_order_relaxed); - } - - private: - bool UnreffedLast(); - - void LogStateChange(const char* op, uint64_t prev_state, uint64_t new_state, - DebugLocation loc = {}) { - if (GRPC_TRACE_FLAG_ENABLED(party_state)) { - gpr_log(loc.file(), loc.line(), GPR_LOG_SEVERITY_INFO, - "Party %p %30s: %016" PRIx64 " -> %016" PRIx64, this, op, - prev_state, new_state); - } - } - - // State bits: - // The atomic state_ field is composed of the following: - // - 24 bits for ref counts - // 1 is owned by the party prior to Orphan() - // All others are owned by owning wakers - // - 1 bit to indicate whether the party is locked - // The first thread to set this owns the party until it is unlocked - // That thread will run the main loop until no further work needs to - // be done. - // - 1 bit to indicate whether there are participants waiting to be - // added - // - 16 bits, one per participant, indicating which participants have - // been - // woken up and should be polled next time the main loop runs. - - // clang-format off - // Bits used to store 16 bits of wakeups - static constexpr uint64_t kWakeupMask = 0x0000'0000'0000'ffff; - // Bits used to store 16 bits of allocated participant slots. - static constexpr uint64_t kAllocatedMask = 0x0000'0000'ffff'0000; - // Bit indicating destruction has begun (refs went to zero) - static constexpr uint64_t kDestroying = 0x0000'0001'0000'0000; - // Bit indicating locked or not - static constexpr uint64_t kLocked = 0x0000'0008'0000'0000; - // Bits used to store 24 bits of ref counts - static constexpr uint64_t kRefMask = 0xffff'ff00'0000'0000; - // clang-format on - - // Shift to get from a participant mask to an allocated mask. - static constexpr size_t kAllocatedShift = 16; - // How far to shift to get the refcount - static constexpr size_t kRefShift = 40; - // One ref count - static constexpr uint64_t kOneRef = 1ull << kRefShift; - - std::atomic state_; - std::atomic iteration_{0}; - WakeupMask wake_after_poll_ = 0; -}; - -class PartySyncUsingMutex { - public: - explicit PartySyncUsingMutex(size_t initial_refs) : refs_(initial_refs) {} - - void IncrementRefCount() { refs_.Ref(); } - GRPC_MUST_USE_RESULT bool RefIfNonZero() { return refs_.RefIfNonZero(); } - GRPC_MUST_USE_RESULT bool Unref() { return refs_.Unref(); } - void ForceImmediateRepoll(WakeupMask mask) { - MutexLock lock(&mu_); - wakeups_ |= mask; - } - template - GRPC_MUST_USE_RESULT bool RunParty(F poll_one_participant) { - WakeupMask freed = 0; - while (true) { - ReleasableMutexLock lock(&mu_); - CHECK(locked_); - allocated_ &= ~std::exchange(freed, 0); - auto wakeup = std::exchange(wakeups_, 0); - if (wakeup == 0) { - locked_ = false; - return false; - } - lock.Release(); - for (size_t i = 0; wakeup != 0; i++, wakeup >>= 1) { - if ((wakeup & 1) == 0) continue; - if (poll_one_participant(i)) freed |= 1 << i; - } - } - } - - template - GRPC_MUST_USE_RESULT bool AddParticipantsAndRef(size_t count, F store) { - IncrementRefCount(); - MutexLock lock(&mu_); - size_t slots[party_detail::kMaxParticipants]; - WakeupMask wakeup_mask = 0; - size_t n = 0; - for (size_t bit = 0; n < count && bit < party_detail::kMaxParticipants; - bit++) { - if (allocated_ & (1 << bit)) continue; - slots[n++] = bit; - wakeup_mask |= 1 << bit; - allocated_ |= 1 << bit; - } - CHECK(n == count); - store(slots); - wakeups_ |= wakeup_mask; - return !std::exchange(locked_, true); - } - - GRPC_MUST_USE_RESULT bool ScheduleWakeup(WakeupMask mask); - - private: - RefCount refs_; - Mutex mu_; - WakeupMask allocated_ ABSL_GUARDED_BY(mu_) = 0; - WakeupMask wakeups_ ABSL_GUARDED_BY(mu_) = 0; - bool locked_ ABSL_GUARDED_BY(mu_) = false; -}; - // A Party is an Activity with multiple participant promises. class Party : public Activity, private Wakeable { private: @@ -346,7 +63,6 @@ class Party : public Activity, private Wakeable { // One participant in the party. class Participant { public: - explicit Participant(absl::string_view name) : name_(name) {} // Poll the participant. Return true if complete. // Participant should take care of its own deallocation in this case. virtual bool PollParticipantPromise() = 0; @@ -357,20 +73,22 @@ class Party : public Activity, private Wakeable { // Return a Handle instance for this participant. Wakeable* MakeNonOwningWakeable(Party* party); - absl::string_view name() const { return name_; } - protected: ~Participant(); private: Handle* handle_ = nullptr; - absl::string_view name_; }; public: Party(const Party&) = delete; Party& operator=(const Party&) = delete; + static RefCountedPtr Make(RefCountedPtr arena) { + auto* arena_ptr = arena.get(); + return RefCountedPtr(arena_ptr->New(std::move(arena))); + } + // Spawn one promise into the party. // The promise will be polled until it is resolved, or until the party is shut // down. @@ -401,28 +119,23 @@ class Party : public Activity, private Wakeable { Waker MakeNonOwningWaker() final; std::string ActivityDebugTag(WakeupMask wakeup_mask) const final; - void IncrementRefCount() { sync_.IncrementRefCount(); } - void Unref() { - if (sync_.Unref()) PartyIsOver(); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void IncrementRefCount() { + const uint64_t prev_state = + state_.fetch_add(kOneRef, std::memory_order_relaxed); + LogStateChange("IncrementRefCount", prev_state, prev_state + kOneRef); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Unref() { + uint64_t prev_state = state_.fetch_sub(kOneRef, std::memory_order_acq_rel); + LogStateChange("Unref", prev_state, prev_state - kOneRef); + if ((prev_state & kRefMask) == kOneRef) PartyIsOver(); + } + RefCountedPtr Ref() { IncrementRefCount(); return RefCountedPtr(this); } - // Return a promise that resolves to Empty{} when the current party poll is - // complete. - // This is useful for implementing batching and the like: we can hold some - // action until the rest of the party resolves itself. - auto AfterCurrentPoll() { - DCHECK(GetContext() == this); - sync_.WakeAfterPoll(CurrentParticipant()); - return [this, iteration = sync_.iteration()]() -> Poll { - DCHECK(GetContext() == this); - if (iteration == sync_.iteration()) return Pending{}; - return Empty{}; - }; - } + Arena* arena() { return arena_.get(); } class BulkSpawner { public: @@ -442,25 +155,18 @@ class Party : public Activity, private Wakeable { }; protected: - explicit Party(size_t initial_refs) : sync_(initial_refs) {} + friend class Arena; + + // Derived types should be constructed upon `arena`. + explicit Party(RefCountedPtr arena) : arena_(std::move(arena)) {} ~Party() override; // Main run loop. Must be locked. // Polls participants and drains the add queue until there is no work left to // be done. - // Derived types will likely want to override this to set up their - // contexts before polling. - // Should not be called by derived types except as a tail call to the base - // class RunParty when overriding this method to add custom context. - // Returns true if the party is over. - GRPC_MUST_USE_RESULT virtual bool RunParty(); - - bool RefIfNonZero() { return sync_.RefIfNonZero(); } + void RunPartyAndUnref(uint64_t prev_state); - // Destroy any remaining participants. - // Should be called by derived types in response to PartyOver. - // Needs to have normal context setup before calling. - void CancelRemainingParticipants(); + bool RefIfNonZero(); private: // Concrete implementation of a participant for some promise & oncomplete @@ -471,9 +177,9 @@ class Party : public Activity, private Wakeable { using Promise = typename Factory::Promise; public: - ParticipantImpl(absl::string_view name, SuppliedFactory promise_factory, + ParticipantImpl(absl::string_view, SuppliedFactory promise_factory, OnComplete on_complete) - : Participant(name), on_complete_(std::move(on_complete)) { + : on_complete_(std::move(on_complete)) { Construct(&factory_, std::move(promise_factory)); } ~ParticipantImpl() { @@ -521,9 +227,7 @@ class Party : public Activity, private Wakeable { using Result = typename Promise::Result; public: - PromiseParticipantImpl(absl::string_view name, - SuppliedFactory promise_factory) - : Participant(name) { + PromiseParticipantImpl(absl::string_view, SuppliedFactory promise_factory) { Construct(&factory_, std::move(promise_factory)); } @@ -594,46 +298,118 @@ class Party : public Activity, private Wakeable { std::atomic state_{State::kFactory}; }; - // Notification that the party has finished and this instance can be deleted. - // Derived types should arrange to call CancelRemainingParticipants during - // this sequence. - virtual void PartyOver() = 0; + // State bits: + // The atomic state_ field is composed of the following: + // - 24 bits for ref counts + // 1 is owned by the party prior to Orphan() + // All others are owned by owning wakers + // - 1 bit to indicate whether the party is locked + // The first thread to set this owns the party until it is unlocked + // That thread will run the main loop until no further work needs to + // be done. + // - 1 bit to indicate whether there are participants waiting to be + // added + // - 16 bits, one per participant, indicating which participants have + // been + // woken up and should be polled next time the main loop runs. + + // clang-format off + // Bits used to store 16 bits of wakeups + static constexpr uint64_t kWakeupMask = 0x0000'0000'0000'ffff; + // Bits used to store 16 bits of allocated participant slots. + static constexpr uint64_t kAllocatedMask = 0x0000'0000'ffff'0000; + // Bit indicating locked or not + static constexpr uint64_t kLocked = 0x0000'0008'0000'0000; + // Bits used to store 24 bits of ref counts + static constexpr uint64_t kRefMask = 0xffff'ff00'0000'0000; + // clang-format on + + // Shift to get from a participant mask to an allocated mask. + static constexpr size_t kAllocatedShift = 16; + // How far to shift to get the refcount + static constexpr size_t kRefShift = 40; + // One ref count + static constexpr uint64_t kOneRef = 1ull << kRefShift; + + // Destroy any remaining participants. + // Needs to have normal context setup before calling. + void CancelRemainingParticipants(); // Run the locked part of the party until it is unlocked. - void RunLocked(); + static void RunLockedAndUnref(Party* party, uint64_t prev_state); // Called in response to Unref() hitting zero - ultimately calls PartyOver, // but needs to set some stuff up. // Here so it gets compiled out of line. void PartyIsOver(); // Wakeable implementation - void Wakeup(WakeupMask wakeup_mask) final; + void Wakeup(WakeupMask wakeup_mask) final { + if (Activity::current() == this) { + wakeup_mask_ |= wakeup_mask; + Unref(); + return; + } + WakeupFromState(state_.load(std::memory_order_relaxed), wakeup_mask); + } + + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void WakeupFromState( + uint64_t cur_state, WakeupMask wakeup_mask) { + DCHECK_NE(wakeup_mask & kWakeupMask, 0u) + << "Wakeup mask must be non-zero: " << wakeup_mask; + while (true) { + if (cur_state & kLocked) { + // If the party is locked, we need to set the wakeup bits, and then + // we'll immediately unref. Since something is running this should never + // bring the refcount to zero. + DCHECK_GT(cur_state & kRefMask, kOneRef); + auto new_state = (cur_state | wakeup_mask) - kOneRef; + if (state_.compare_exchange_weak(cur_state, new_state, + std::memory_order_release)) { + LogStateChange("Wakeup", cur_state, cur_state | wakeup_mask); + return; + } + } else { + // If the party is not locked, we need to lock it and run. + DCHECK_EQ(cur_state & kWakeupMask, 0u); + if (state_.compare_exchange_weak(cur_state, cur_state | kLocked, + std::memory_order_acq_rel)) { + LogStateChange("WakeupAndRun", cur_state, cur_state | kLocked); + wakeup_mask_ |= wakeup_mask; + RunLockedAndUnref(this, cur_state); + return; + } + } + } + } + void WakeupAsync(WakeupMask wakeup_mask) final; void Drop(WakeupMask wakeup_mask) final; // Add a participant (backs Spawn, after type erasure to ParticipantFactory). void AddParticipants(Participant** participant, size_t count); - bool RunOneParticipant(int i); - - virtual grpc_event_engine::experimental::EventEngine* event_engine() - const = 0; + void AddParticipant(Participant* participant); + void DelayAddParticipants(Participant** participant, size_t count); + + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void LogStateChange( + const char* op, uint64_t prev_state, uint64_t new_state, + DebugLocation loc = {}) { + GRPC_TRACE_LOG(party_state, INFO).AtLocation(loc.file(), loc.line()) + << DebugTag() << " " << op << " " + << absl::StrFormat("%016" PRIx64 " -> %016" PRIx64, prev_state, + new_state); + } // Sentinal value for currently_polling_ when no participant is being polled. static constexpr uint8_t kNotPolling = 255; -#ifdef GRPC_PARTY_SYNC_USING_ATOMICS - PartySyncUsingAtomics sync_; -#elif defined(GRPC_PARTY_SYNC_USING_MUTEX) - PartySyncUsingMutex sync_; -#else -#error No synchronization method defined -#endif - + std::atomic state_{kOneRef}; uint8_t currently_polling_ = kNotPolling; + WakeupMask wakeup_mask_ = 0; // All current participants, using a tagged format. // If the lower bit is unset, then this is a Participant*. // If the lower bit is set, then this is a ParticipantFactory*. std::atomic participants_[party_detail::kMaxParticipants] = {}; + RefCountedPtr arena_; }; template <> @@ -654,8 +430,8 @@ void Party::BulkSpawner::Spawn(absl::string_view name, Factory promise_factory, template void Party::Spawn(absl::string_view name, Factory promise_factory, OnComplete on_complete) { - BulkSpawner(this).Spawn(name, std::move(promise_factory), - std::move(on_complete)); + AddParticipant(new ParticipantImpl( + name, std::move(promise_factory), std::move(on_complete))); } template @@ -663,7 +439,7 @@ auto Party::SpawnWaitable(absl::string_view name, Factory promise_factory) { auto participant = MakeRefCounted>( name, std::move(promise_factory)); Participant* p = participant->Ref().release(); - AddParticipants(&p, 1); + AddParticipant(p); return [participant = std::move(participant)]() mutable { return participant->PollCompletion(); }; diff --git a/deps/grpc/src/core/lib/promise/pipe.h b/deps/grpc/src/core/lib/promise/pipe.h index 9c896682fe..59ec003f47 100644 --- a/deps/grpc/src/core/lib/promise/pipe.h +++ b/deps/grpc/src/core/lib/promise/pipe.h @@ -28,7 +28,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" -#include #include #include "src/core/lib/gprpp/debug_location.h" @@ -635,10 +634,9 @@ class Push { Poll operator()() { if (center_ == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "%s Pipe push has a null center", - GetContext()->DebugTag().c_str()); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << GetContext()->DebugTag() + << " Pipe push has a null center"; return false; } if (auto* p = absl::get_if(&state_)) { diff --git a/deps/grpc/src/core/lib/promise/poll.h b/deps/grpc/src/core/lib/promise/poll.h index 57a4a65e83..36570a56fb 100644 --- a/deps/grpc/src/core/lib/promise/poll.h +++ b/deps/grpc/src/core/lib/promise/poll.h @@ -19,8 +19,9 @@ #include #include "absl/log/check.h" +#include "absl/strings/str_format.h" +#include "absl/types/optional.h" -#include #include #include "src/core/lib/gprpp/construct_destruct.h" @@ -31,12 +32,22 @@ namespace grpc_core { // Allows writing 'return Pending{}' and with automatic conversions gets // upgraded to a Poll<> object. struct Pending {}; -inline bool operator==(const Pending&, const Pending&) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(const Pending&, + const Pending&) { + return true; +} // A type that contains no value. Useful for simulating 'void' in promises that // always need to return some kind of value. struct Empty {}; -inline bool operator==(const Empty&, const Empty&) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(const Empty&, + const Empty&) { + return true; +} +template +void AbslStringify(Sink& sink, Empty) { + sink.Append("{}"); +} // The result of polling a Promise once. // @@ -46,15 +57,17 @@ template class Poll { public: // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Pending) : ready_(false) {} - Poll() : ready_(false) {} - Poll(const Poll& other) : ready_(other.ready_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Pending) : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll() : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(const Poll& other) + : ready_(other.ready_) { if (ready_) Construct(&value_, other.value_); } - Poll(Poll&& other) noexcept : ready_(other.ready_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Poll&& other) noexcept + : ready_(other.ready_) { if (ready_) Construct(&value_, std::move(other.value_)); } - Poll& operator=(const Poll& other) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll& operator=(const Poll& other) { if (ready_) { if (other.ready_) { value_ = other.value_; @@ -68,7 +81,7 @@ class Poll { } return *this; } - Poll& operator=(Poll&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll& operator=(Poll&& other) noexcept { if (ready_) { if (other.ready_) { value_ = std::move(other.value_); @@ -84,34 +97,36 @@ class Poll { } template // NOLINTNEXTLINE(google-explicit-constructor) - Poll(U value) : ready_(true) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(U value) : ready_(true) { Construct(&value_, std::move(value)); } // NOLINTNEXTLINE(google-explicit-constructor) - Poll(T&& value) : ready_(true) { Construct(&value_, std::forward(value)); } - ~Poll() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(T&& value) : ready_(true) { + Construct(&value_, std::forward(value)); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Poll() { if (ready_) Destruct(&value_); } - bool pending() const { return !ready_; } - bool ready() const { return ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool pending() const { return !ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ready() const { return ready_; } - T& value() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& value() { DCHECK(ready()); return value_; } - const T& value() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& value() const { DCHECK(ready()); return value_; } - T* value_if_ready() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* value_if_ready() { if (ready()) return &value_; return nullptr; } - const T* value_if_ready() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T* value_if_ready() const { if (ready()) return &value_; return nullptr; } @@ -142,31 +157,31 @@ template <> class Poll { public: // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Pending) : ready_(false) {} - Poll() : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Pending) : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll() : ready_(false) {} Poll(const Poll& other) = default; Poll(Poll&& other) noexcept = default; Poll& operator=(const Poll& other) = default; Poll& operator=(Poll&& other) = default; // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Empty) : ready_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Empty) : ready_(true) {} ~Poll() = default; - bool pending() const { return !ready_; } - bool ready() const { return ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool pending() const { return !ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ready() const { return ready_; } - Empty value() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Empty value() const { DCHECK(ready()); return Empty{}; } - Empty* value_if_ready() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Empty* value_if_ready() { static Empty value; if (ready()) return &value; return nullptr; } - const Empty* value_if_ready() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const Empty* value_if_ready() const { static Empty value; if (ready()) return &value; return nullptr; @@ -194,17 +209,22 @@ class Poll>; template struct PollTraits { using Type = T; - static constexpr bool is_poll() { return false; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static constexpr bool is_poll() { + return false; + } }; template struct PollTraits> { using Type = T; - static constexpr bool is_poll() { return true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static constexpr bool is_poll() { + return true; + } }; template -bool operator==(const Poll& a, const Poll& b) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(const Poll& a, + const Poll& b) { if (a.pending() && b.pending()) return true; if (a.ready() && b.ready()) return a.value() == b.value(); return false; @@ -215,7 +235,7 @@ struct PollCastImpl; template struct PollCastImpl> { - static Poll Cast(Poll&& poll) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(Poll&& poll) { if (poll.pending()) return Pending{}; return static_cast(std::move(poll.value())); } @@ -223,21 +243,27 @@ struct PollCastImpl> { template struct PollCastImpl::is_poll()>> { - static Poll Cast(U&& poll) { return Poll(T(std::move(poll))); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(U&& poll) { + return Poll(T(std::move(poll))); + } }; template struct PollCastImpl { - static Poll Cast(T&& poll) { return Poll(std::move(poll)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(T&& poll) { + return Poll(std::move(poll)); + } }; template struct PollCastImpl> { - static Poll Cast(Poll&& poll) { return std::move(poll); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(Poll&& poll) { + return std::move(poll); + } }; template -Poll poll_cast(U poll) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll poll_cast(U poll) { return PollCastImpl::Cast(std::move(poll)); } @@ -252,6 +278,45 @@ std::string PollToString( return t_to_string(poll.value()); } +template +void AbslStringify(Sink& sink, const Poll& poll) { + if (poll.pending()) { + absl::Format(&sink, "<>"); + return; + } + absl::Format(&sink, "%v", poll.value()); +} + +template +void AbslStringify(Sink& sink, const Poll>& poll) { + if (poll.pending()) { + absl::Format(&sink, "<>"); + return; + } + const auto& value = poll.value(); + if (value.has_value()) { + absl::Format(&sink, "%v", value); + } else { + sink.append("nullopt"); + } +} + +// Hack to get metadata printing +template +void AbslStringify( + Sink& sink, const Poll>>& poll) { + if (poll.pending()) { + absl::Format(&sink, "<>"); + return; + } + const auto& value = poll.value(); + if (value.has_value()) { + absl::Format(&sink, "%v", *value); + } else { + sink.Append("nullopt"); + } +} + } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_PROMISE_POLL_H diff --git a/deps/grpc/src/core/lib/promise/promise.h b/deps/grpc/src/core/lib/promise/promise.h index 1595f2a878..cb26a16507 100644 --- a/deps/grpc/src/core/lib/promise/promise.h +++ b/deps/grpc/src/core/lib/promise/promise.h @@ -58,9 +58,12 @@ namespace promise_detail { template class Immediate { public: - explicit Immediate(T value) : value_(std::move(value)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Immediate(T value) + : value_(std::move(value)) {} - Poll operator()() { return std::move(value_); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { + return std::move(value_); + } private: T value_; @@ -69,13 +72,16 @@ class Immediate { // Return \a value immediately template -promise_detail::Immediate Immediate(T value) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Immediate Immediate( + T value) { return promise_detail::Immediate(std::move(value)); } // Return status Ok immediately struct ImmediateOkStatus { - Poll operator()() { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { + return absl::OkStatus(); + } }; // Typecheck that a promise returns the expected return type. @@ -84,7 +90,7 @@ struct ImmediateOkStatus { // should fail to compile. When modifying this code these should be uncommented // and their miscompilation verified. template -auto WithResult(F f) -> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto WithResult(F f) -> typename std::enable_if>::value, F>::type { return f; diff --git a/deps/grpc/src/core/lib/promise/promise_mutex.h b/deps/grpc/src/core/lib/promise/promise_mutex.h index d1e01f2231..b7014da249 100644 --- a/deps/grpc/src/core/lib/promise/promise_mutex.h +++ b/deps/grpc/src/core/lib/promise/promise_mutex.h @@ -19,7 +19,6 @@ #include "absl/log/check.h" -#include #include #include "src/core/lib/promise/activity.h" diff --git a/deps/grpc/src/core/lib/promise/race.h b/deps/grpc/src/core/lib/promise/race.h index e23a067979..83de1a617d 100644 --- a/deps/grpc/src/core/lib/promise/race.h +++ b/deps/grpc/src/core/lib/promise/race.h @@ -32,10 +32,11 @@ class Race { public: using Result = decltype(std::declval()()); - explicit Race(Promise promise, Promises... promises) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Race(Promise promise, + Promises... promises) : promise_(std::move(promise)), next_(std::move(promises)...) {} - Result operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Result operator()() { // Check our own promise. auto r = promise_(); if (r.pending()) { @@ -57,8 +58,11 @@ template class Race { public: using Result = decltype(std::declval()()); - explicit Race(Promise promise) : promise_(std::move(promise)) {} - Result operator()() { return promise_(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Race(Promise promise) + : promise_(std::move(promise)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Result operator()() { + return promise_(); + } private: Promise promise_; @@ -70,7 +74,8 @@ class Race { /// If two results are simultaneously available, bias towards the first result /// listed. template -promise_detail::Race Race(Promises... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Race Race( + Promises... promises) { return promise_detail::Race(std::move(promises)...); } diff --git a/deps/grpc/src/core/lib/promise/seq.h b/deps/grpc/src/core/lib/promise/seq.h index f1bbb2f322..d25a8caefb 100644 --- a/deps/grpc/src/core/lib/promise/seq.h +++ b/deps/grpc/src/core/lib/promise/seq.h @@ -36,22 +36,27 @@ struct SeqTraits { using UnwrappedType = T; using WrappedType = T; template - static auto CallFactory(Next* next, T&& value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto CallFactory(Next* next, + T&& value) { return next->Make(std::forward(value)); } - static bool IsOk(const T&) { return true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const T&) { + return true; + } static const char* ErrorString(const T&) { abort(); } template static R ReturnValue(T&&) { abort(); } template - static auto CallSeqFactory(F& f, Elem&& elem, T&& value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto CallSeqFactory(F& f, + Elem&& elem, + T&& value) { return f(std::forward(elem), std::forward(value)); } template - static Poll CheckResultAndRunNext(PriorResult prior, - RunNext run_next) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll + CheckResultAndRunNext(PriorResult prior, RunNext run_next) { return run_next(std::move(prior)); } }; @@ -59,11 +64,15 @@ struct SeqTraits { template class Seq { public: - explicit Seq(P&& promise, Fs&&... factories, DebugLocation whence) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Seq(P&& promise, + Fs&&... factories, + DebugLocation whence) : state_(std::forward

(promise), std::forward(factories)..., whence) {} - auto operator()() { return state_.PollOnce(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() { + return state_.PollOnce(); + } private: SeqState state_; @@ -98,32 +107,33 @@ struct SeqIterResultTraits { // etc // Return the final value. template -F Seq(F functor) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION F Seq(F functor) { return functor; } template -promise_detail::Seq Seq(F0 f0, F1 f1, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, F2 f2, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), std::move(f2), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, F2 f2, F3 f3, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq +Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), whence); @@ -131,9 +141,8 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - F4 f4, F5 f5, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq +Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), whence); @@ -141,9 +150,10 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - F4 f4, F5 f5, F6 f6, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), whence); @@ -151,9 +161,10 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), whence); @@ -161,9 +172,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), whence); @@ -171,9 +183,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), @@ -183,9 +196,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - F10 f10, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + F10 f10, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), @@ -195,9 +209,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - F10 f10, F11 f11, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + F10 f10, F11 f11, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), diff --git a/deps/grpc/src/core/lib/promise/status_flag.h b/deps/grpc/src/core/lib/promise/status_flag.h index 132b2079c0..250dce5050 100644 --- a/deps/grpc/src/core/lib/promise/status_flag.h +++ b/deps/grpc/src/core/lib/promise/status_flag.h @@ -15,12 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H +#include + #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" #include "absl/types/optional.h" -#include #include #include "src/core/lib/promise/detail/status.h" @@ -40,43 +42,58 @@ struct Success { } }; -inline bool IsStatusOk(Failure) { return false; } -inline bool IsStatusOk(Success) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk(Failure) { + return false; +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk(Success) { + return true; +} template <> struct StatusCastImpl { - static absl::Status Cast(Success) { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Success) { + return absl::OkStatus(); + } }; template <> struct StatusCastImpl { - static absl::Status Cast(Success) { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Success) { + return absl::OkStatus(); + } }; template <> struct StatusCastImpl { - static absl::Status Cast(Failure) { return absl::CancelledError(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Failure) { + return absl::CancelledError(); + } }; template struct StatusCastImpl, Failure> { - static absl::StatusOr Cast(Failure) { return absl::CancelledError(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast(Failure) { + return absl::CancelledError(); + } }; // A boolean representing whether an operation succeeded (true) or failed // (false). class StatusFlag { public: - StatusFlag() : value_(true) {} - explicit StatusFlag(bool value) : value_(value) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag() : value_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit StatusFlag(bool value) + : value_(value) {} // NOLINTNEXTLINE(google-explicit-constructor) - StatusFlag(Failure) : value_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag(Failure) : value_(false) {} // NOLINTNEXTLINE(google-explicit-constructor) - StatusFlag(Success) : value_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag(Success) : value_(true) {} - bool ok() const { return value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ok() const { return value_; } - bool operator==(StatusFlag other) const { return value_ == other.value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(StatusFlag other) const { + return value_ == other.value_; + } std::string ToString() const { return value_ ? "ok" : "failed"; } template @@ -92,42 +109,78 @@ class StatusFlag { bool value_; }; -inline bool operator==(StatusFlag flag, Failure) { return !flag.ok(); } -inline bool operator==(Failure, StatusFlag flag) { return !flag.ok(); } -inline bool operator==(StatusFlag flag, Success) { return flag.ok(); } -inline bool operator==(Success, StatusFlag flag) { return flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(StatusFlag flag, + Failure) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(Failure, + StatusFlag flag) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(StatusFlag flag, + Success) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(Success, + StatusFlag flag) { + return flag.ok(); +} -inline bool operator!=(StatusFlag flag, Failure) { return flag.ok(); } -inline bool operator!=(Failure, StatusFlag flag) { return flag.ok(); } -inline bool operator!=(StatusFlag flag, Success) { return !flag.ok(); } -inline bool operator!=(Success, StatusFlag flag) { return !flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(StatusFlag flag, + Failure) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(Failure, + StatusFlag flag) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(StatusFlag flag, + Success) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(Success, + StatusFlag flag) { + return !flag.ok(); +} -inline bool IsStatusOk(const StatusFlag& flag) { return flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const StatusFlag& flag) { + return flag.ok(); +} template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; +template <> +struct StatusCastImpl { + static StatusFlag Cast(Success) { return StatusFlag(true); } +}; + template struct FailureStatusCastImpl, StatusFlag> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -135,7 +188,8 @@ struct FailureStatusCastImpl, StatusFlag> { template struct FailureStatusCastImpl, StatusFlag&> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -143,7 +197,8 @@ struct FailureStatusCastImpl, StatusFlag&> { template struct FailureStatusCastImpl, const StatusFlag&> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -160,49 +215,90 @@ class ValueOrFailure { // NOLINTNEXTLINE(google-explicit-constructor) ValueOrFailure(StatusFlag status) { CHECK(!status.ok()); } - static ValueOrFailure FromOptional(absl::optional value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure FromOptional( + absl::optional value) { return ValueOrFailure{std::move(value)}; } - bool ok() const { return value_.has_value(); } - StatusFlag status() const { return StatusFlag(ok()); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ok() const { + return value_.has_value(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag status() const { + return StatusFlag(ok()); + } - const T& value() const { return value_.value(); } - T& value() { return value_.value(); } - const T& operator*() const { return *value_; } - T& operator*() { return *value_; } - const T* operator->() const { return &*value_; } - T* operator->() { return &*value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& value() const { + return value_.value(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& value() { return value_.value(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& operator*() const { + return *value_; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& operator*() { return *value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T* operator->() const { + return &*value_; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* operator->() { return &*value_; } - bool operator==(const ValueOrFailure& other) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==( + const ValueOrFailure& other) const { return value_ == other.value_; } - bool operator!=(const ValueOrFailure& other) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator!=( + const ValueOrFailure& other) const { return value_ != other.value_; } - bool operator==(const T& other) const { return value_ == other; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(const T& other) const { + return value_ == other; + } - bool operator!=(const T& other) const { return value_ != other; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator!=(const T& other) const { + return value_ != other; + } + + template + friend void AbslStringify(Sink& sink, const ValueOrFailure& value) { + if (value.ok()) { + sink.Append("Success("); + sink.Append(absl::StrCat(*value)); + sink.Append(")"); + } else { + sink.Append("Failure"); + } + } private: absl::optional value_; }; template -inline bool IsStatusOk(const ValueOrFailure& value) { +inline std::ostream& operator<<(std::ostream& os, + const ValueOrFailure& value) { + if (value.ok()) { + return os << "Success(" << *value << ")"; + } else { + return os << "Failure"; + } +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const ValueOrFailure& value) { return value.ok(); } template -inline T TakeValue(ValueOrFailure&& value) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline T TakeValue( + ValueOrFailure&& value) { return std::move(value.value()); } template struct StatusCastImpl, ValueOrFailure> { - static absl::StatusOr Cast(ValueOrFailure value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + ValueOrFailure value) { return value.ok() ? absl::StatusOr(std::move(value.value())) : absl::CancelledError(); } @@ -210,14 +306,15 @@ struct StatusCastImpl, ValueOrFailure> { template struct StatusCastImpl, Failure> { - static ValueOrFailure Cast(Failure) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast(Failure) { return ValueOrFailure(Failure{}); } }; template struct StatusCastImpl, StatusFlag&> { - static ValueOrFailure Cast(StatusFlag f) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast( + StatusFlag f) { CHECK(!f.ok()); return ValueOrFailure(Failure{}); } @@ -225,7 +322,8 @@ struct StatusCastImpl, StatusFlag&> { template struct StatusCastImpl, StatusFlag> { - static ValueOrFailure Cast(StatusFlag f) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast( + StatusFlag f) { CHECK(!f.ok()); return ValueOrFailure(Failure{}); } @@ -233,4 +331,4 @@ struct StatusCastImpl, StatusFlag> { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H \ No newline at end of file +#endif // GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H diff --git a/deps/grpc/src/core/lib/promise/try_join.h b/deps/grpc/src/core/lib/promise/try_join.h index 77b0496792..5cde944fe4 100644 --- a/deps/grpc/src/core/lib/promise/try_join.h +++ b/deps/grpc/src/core/lib/promise/try_join.h @@ -51,44 +51,56 @@ struct TryJoinTraits { template using ResultType = Result>; template - static bool IsOk(const absl::StatusOr& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk( + const absl::StatusOr& x) { + return x.ok(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const absl::Status& x) { + return x.ok(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(StatusFlag x) { return x.ok(); } - static bool IsOk(const absl::Status& x) { return x.ok(); } - static bool IsOk(StatusFlag x) { return x.ok(); } template - static bool IsOk(const ValueOrFailure& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk( + const ValueOrFailure& x) { return x.ok(); } template - static T Unwrapped(absl::StatusOr x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T Unwrapped(absl::StatusOr x) { return std::move(*x); } template - static T Unwrapped(ValueOrFailure x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T Unwrapped(ValueOrFailure x) { return std::move(*x); } - static Empty Unwrapped(absl::Status) { return Empty{}; } - static Empty Unwrapped(StatusFlag) { return Empty{}; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(absl::Status) { + return Empty{}; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(StatusFlag) { + return Empty{}; + } template - static R EarlyReturn(absl::StatusOr x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn( + absl::StatusOr x) { return x.status(); } template - static R EarlyReturn(absl::Status x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(absl::Status x) { return FailureStatusCast(std::move(x)); } template - static R EarlyReturn(StatusFlag x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(StatusFlag x) { return FailureStatusCast(x); } template - static R EarlyReturn(const ValueOrFailure& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn( + const ValueOrFailure& x) { CHECK(!x.ok()); return FailureStatusCast(Failure{}); } template - static auto FinalReturn(A&&... a) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto FinalReturn(A&&... a) { return Result>(std::make_tuple(std::forward(a)...)); } }; @@ -97,8 +109,11 @@ struct TryJoinTraits { template